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

694 Commits

Author SHA1 Message Date
Jan Steemann 34057af3bc Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-22 12:01:47 +01:00
Max Neunhoeffer ee9666e845 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-03-21 23:02:59 +01:00
Max Neunhoeffer cc76ffc5d2 Fix bug that callback was not called for singleRequest case in ClusterComm. 2016-03-21 23:00:44 +01:00
Jan Steemann ce63219435 removed DocumentAccessor 2016-03-21 15:40:44 +01:00
jsteemann 906418778c cppcheck 2016-03-18 11:23:38 +01:00
jsteemann fd49f750fb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 10:46:03 +01:00
Andreas Streichardt 90862b6081 Proper secondary => Primary failover 2016-03-17 22:39:15 +00:00
Michael Hackstein 2d2cfae297 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-17 18:51:30 +01:00
Michael Hackstein 401f55ae37 Replaced OperationCursor by shared_ptrs every where and removed the slice function from it. Instead it returns a shared ptr on a OperationResult on getMore 2016-03-17 18:49:20 +01:00
Andreas Streichardt dca42efb2e Rework cluster state handling 2016-03-17 14:48:33 +00:00
jsteemann 171488b6d2 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 23:34:29 +01:00
Andreas Streichardt 614beefc74 Throw Http error 503 when a required backend is unavailable 2016-03-16 18:04:05 +00:00
Michael Hackstein 4a2c33eafc Replaced setStartVertex(Slice) by setStartVertex(string) in Traversal and fixed all resulting compile errors. It now compiles but is not Functional yet. Have to implement reading of Documents from DB in TRX / VPack Style 2016-03-16 11:12:27 +01:00
jsteemann 9cb9dfd8af Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-14 17:54:54 +01:00
jsteemann 358b09260e fixed prologue marker writing 2016-03-14 17:54:46 +01:00
Max Neunhoeffer d4fb621d19 Remove old code w.r.t. shardKeysChanged test. 2016-03-14 16:31:37 +01:00
Michael Hackstein 23f845de05 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 10:46:30 +01:00
Michael Hackstein 4c4c117059 Partially Adopted Traverser to new transaction API. This is still work in Progress. It compiles but it will not work yet. 2016-03-10 10:42:20 +01:00
Max Neunhoeffer d51beb5326 Get rid of update_policy for good. 2016-03-10 00:14:06 +01:00
jsteemann 279fb105e2 cppcheck 2016-03-09 22:57:49 +01:00
jsteemann a7450eb65f removed some includes 2016-03-09 22:21:08 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 1a5e89ecd9 removed JsonHelper include 2016-03-07 16:24:59 +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 6eea757c01 simplifications 2016-03-04 19:40:24 +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
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
Jan Steemann 337fc4bca4 remove std::mutex 2016-03-03 17:47:46 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
jsteemann 545b0ed6a2 cleanup 2016-02-27 02:44:51 +01:00
Michael Hackstein ac173ca497 The Edge Index now indexes with VPackSlice instead of TRI_edge_header_t. Some functions that were using the Edge Index are disabled and will not work. These functions have to be modified to use the new Transaction API. 2016-02-26 13:31:10 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Jan Steemann e1745608e3 inject attribute translator everywhere 2016-02-25 11:13:32 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Jan Steemann e61aec11dd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 18:52:09 +01:00
Frank Celler df0fe99d5e fixed merge conflict 2016-02-24 18:47:27 +01:00
Frank Celler 6e851249e3 fixed superfluous _stop 2016-02-24 18:40:33 +01:00
Jan Steemann 97968b81dc fixed potential undefined behavior 2016-02-24 18:28:46 +01:00
Jan Steemann 4bbccedf0d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 17:46:40 +01:00
Andreas Streichardt 370dbebec8 Allow existing directories during init 2016-02-24 17:31:14 +01:00
Frank Celler bed46519f9 added DETACHED state 2016-02-23 15:27:36 +01:00