Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
27,075 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

8198 Commits

Author SHA1 Message Date
Jan Steemann 1a5e89ecd9 removed JsonHelper include 2016-03-07 16:24:59 +01:00
Jan Steemann 66dff6078d Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 15:35:51 +01:00
Jan Steemann b358fa329d fixed replication dump and logger-follow commands 2016-03-07 15:21:11 +01:00
Michael Hackstein 93861779b4 Merged fuxes for QueryStats 2016-03-07 12:59:22 +01:00
Michael Hackstein a01a1605b1 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-07 12:46:27 +01:00
Michael Hackstein 038573b0db Removed large parts of JSON out of RestAqlHandler. There is still some JSON contained because auf Query still using JSON. Included several warnings for the specfic code pieces 2016-03-07 12:45:34 +01:00
Jan Steemann 6f6f7e23ba executionstats use vpack 2016-03-07 11:20:04 +01:00
Jan Steemann def9d86868 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 10:51:24 +01:00
Jan Steemann c6fa638b67 fixed issue #1765, issue #1770 2016-03-07 10:49:18 +01:00
Max Neunhoeffer af3d61c339 Fix complation. 2016-03-07 09:04:58 +01:00
Max Neunhoeffer ab82405e9a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-07 08:43:38 +01:00
Max Neunhoeffer 9358fcb96f Commit some fixes. 2016-03-07 08:40:54 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Jan Steemann ef4ef4a0f7 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 07:56:29 +01:00
Michael Hackstein 37982177ac Removed unused functions and imports 2016-03-06 11:58:03 +01:00
Michael Hackstein 729847f1e7 Removed the old Json based AQL FunctionParameters. Also removed all Json-based wrappers around the new VelocyPack based AQL functions. 2016-03-06 11:49:53 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann b965cb5e6e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 20:58:06 +01:00
Jan Steemann 0c2fdb9fb9 less dependency on document-collection.h 2016-03-04 20:53:17 +01:00
Jan Steemann 0277ebe5a6 moved TRI_doc_mptr_t into its own file(s) 2016-03-04 20:02:55 +01:00
Jan Steemann 6eea757c01 simplifications 2016-03-04 19:40:24 +01:00
Jan Steemann 05f98cbd72 fixed compile errors 2016-03-04 18:43:51 +01:00
Jan Steemann 1c150d4d6e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 18:35:40 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Andreas Streichardt b753aa226f No double quote 2016-03-04 17:58:27 +01:00
Jan Steemann 4de5e41044 simplifications 2016-03-04 17:48:27 +01:00
Andreas Streichardt 2b31161a21 Fix libev cb 2016-03-04 17:32:12 +01:00
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
Max Neunhoeffer e4ce808349 Finish revolution of document API, RestHandler still missing. 2016-03-04 15:16:23 +01:00
Jan Steemann 5ef3581d16 simplifications 2016-03-04 14:52:43 +01:00
Jan Steemann a1c758b615 deleted some marker types 2016-03-04 13:17:32 +01:00
Jan Steemann eb82d96836 constexpr 2016-03-04 12:33:59 +01:00
Max Neunhoeffer 2654e654db Compiles again, document API not yet sorted out. 2016-03-04 10:32:34 +01:00
jsteemann 0c580f1076 removed unused includes 2016-03-04 02:37:20 +01:00
jsteemann 630c8f44aa use correct includes 2016-03-04 02:30:47 +01:00
jsteemann 053648b36c simplifications 2016-03-04 02:25:18 +01:00
jsteemann cf1427adff smaller datafile markers 2016-03-04 02:25:03 +01:00
jsteemann c2c509ef58 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 21:27:13 +01:00
jsteemann f1474f4c0a fixed logic error 2016-03-03 21:19:51 +01:00
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00
Jan Steemann 337fc4bca4 remove std::mutex 2016-03-03 17:47:46 +01:00
Jan Steemann 16588e33d3 less json 2016-03-03 17:30:15 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Jan Steemann 57634adaa8 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 14:23:45 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Max Neunhoeffer d545702efa Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 13:24:33 +01:00
Michael Hackstein 65cf9efefe Replaced another TRI_associative with a std::vector for Auth. Also replace TRI_vocbase_auth_cache_t by a proper CXX class VocbaseAuthCache. 2016-03-03 11:35:30 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +01:00
jsteemann 60ac50e5c6 cppcheck 2016-03-02 22:09:32 +01:00