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

9436 Commits

Author SHA1 Message Date
jsteemann c0172fe74b use make_shared 2016-04-26 00:02:51 +02:00
jsteemann 26b10e2e10 use make_unique 2016-04-26 00:02:33 +02:00
jsteemann fdd3d0d516 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 22:31:58 +02:00
jsteemann 46e9db4d4e wal simplifications 2016-04-25 22:31:48 +02:00
Kaveh Vahedipour 724c5dd6c7 solaris' ineptness 2016-04-25 16:51:54 +00:00
Jan Steemann b7f3ab4683 micro optimizations 2016-04-25 17:58:11 +02:00
Jan Steemann 7dc214160f fixed variable name 2016-04-25 17:51:34 +02:00
Andreas Streichardt 0dc0dc2df7 Fix use after free 2016-04-25 17:16:51 +02:00
Andreas Streichardt a889cf5710 Rework dispatchedPlanVersion...fix races 2016-04-25 16:40:35 +02:00
Jan Steemann d391e15680 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 15:31:51 +02:00
Jan Steemann c8c8625727 try to fix some undefined behavior on cluster startup 2016-04-25 15:31:23 +02:00
Michael Hackstein ecf267f369 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 15:25:31 +02:00
Michael Hackstein 85a2c3a44c The shortestPath computation now uses Slices instead of strings to identify the documents. 2016-04-25 15:25:22 +02:00
Jan Steemann f93017d880 fix Visual Studio warning 2016-04-25 14:17:35 +02:00
Jan Steemann 5ea01c02b0 fixed number of threads detection 2016-04-25 13:57:59 +02:00
Andreas Streichardt 22e1292420 Reset to 1000ms again 2016-04-25 13:26:27 +02:00
Andreas Streichardt 5257c3fb52 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 13:19:34 +02:00
Andreas Streichardt c5cbc1ae7d Fix cluster collection handling 2016-04-25 13:19:13 +02:00
Michael Hackstein 3065ceafad Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 12:35:59 +02:00
jsteemann 8bc19eaa51 fix insertion 2016-04-25 11:39:26 +02:00
Michael Hackstein db9a4e4af4 Replaced extractIdString by a more optimized variant, which considers the already known collectionname in some graph functions 2016-04-25 11:13:09 +02:00
jsteemann 1fb953a515 improve insertion time 2016-04-25 10:40:48 +02:00
jsteemann 67a0bafbaa fix options 2016-04-24 21:06:09 +02:00
jsteemann f660587336 fix importing of unsupported index types 2016-04-24 19:15:26 +02:00
jsteemann 4b7e0a72d0 moved --version into a feature of its own 2016-04-24 18:42:59 +02:00
jsteemann f4fb6f0dcd fixed arango-dfdb 2016-04-24 16:19:56 +02:00
jsteemann 40d4275871 removed useless method 2016-04-24 15:41:29 +02:00
jsteemann 58198a834e re-added options for foxx queues 2016-04-24 15:27:08 +02:00
jsteemann e3ed9812b4 use value stored in "count" value of collection when re-loading 2016-04-24 14:36:19 +02:00
jsteemann 65a03d2c58 delete duplicate log message 2016-04-24 14:29:49 +02:00
jsteemann dcc5825f93 cleaned up features a bit 2016-04-24 14:29:29 +02:00
Frank Celler 7f35ddc22b fixed assert 2016-04-23 19:55:43 -07:00
Frank Celler 6a9434d6cf fixed assert 2016-04-23 19:29:26 -07:00
Frank Celler 481f342385 merge fixes 2016-04-23 19:02:21 -07:00
Frank Celler c46eb8e65e added LogfileManager as feature 2016-04-23 16:34:57 -07:00
jsteemann 82e814cc69 cppcheck 2016-04-23 20:49:58 +02:00
jsteemann 5b59b6dacd use generateResult instead of home-made solution 2016-04-23 20:49:43 +02:00
jsteemann 28930370c2 micro optimizations 2016-04-23 20:49:22 +02:00
jsteemann 7739d0ed78 no waitForSync during recovery 2016-04-23 17:39:14 +02:00
jsteemann a3fff3dc28 shut down only if no file is left to be collected 2016-04-23 17:10:45 +02:00
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
jsteemann e6b39a8fe8 added simple infrastructure for timing 2016-04-23 11:20:52 +02:00
Jan Steemann e5b86bd814 fixed last compile warning 2016-04-22 21:06:02 +02:00
Jan Steemann 4cf847aecd fixed MSVC complaints 2016-04-22 21:04:03 +02:00
Jan Steemann 104e8e8b9b remove ArangoServer.h remainders 2016-04-22 20:18:28 +02:00
Frank Celler 82d0bac4fa should be optional 2016-04-22 10:39:21 -07:00
Jan Steemann 5fc0e71fa0 intialize status variable to something 2016-04-22 19:16:42 +02:00
Jan Steemann ecbc263b04 removed unused include 2016-04-22 19:16:31 +02:00
Andreas Streichardt 14120af8aa Change default value 2016-04-22 18:34:32 +02:00
Jan Steemann 78a1e6a7ef fix uninitialized variable 2016-04-22 18:32:38 +02:00
Jan Steemann f866d2020a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 17:33:42 +02:00
Jan Steemann a7210caf45 fixed MSVC warnings 2016-04-22 17:33:23 +02:00
Andreas Streichardt a01c5a4b40 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 17:32:57 +02:00
Andreas Streichardt ea32926e45 Properly callbackify create and dropcollection 2016-04-22 17:32:00 +02:00
jsteemann 7db14d381a unified include guards 2016-04-22 16:05:50 +02:00
Jan Steemann ee5260b462 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 15:53:49 +02:00
Jan Steemann 38e543e0a8 cppcheck 2016-04-22 15:51:03 +02:00
Michael Hackstein 26f96068aa Removed unnecessary forward declaration 2016-04-22 15:43:50 +02:00
Jan Steemann 943611143b fixed compile error 2016-04-22 15:36:16 +02:00
Jan Steemann e3db1236c6 fixed compile warnings 2016-04-22 15:31:47 +02:00
Jan Steemann 7d6994862e fixed startup/shutdown with specific features 2016-04-22 14:44:42 +02:00
Jan Steemann f603808f88 fixed V8 leaks 2016-04-22 14:10:23 +02:00
Michael Hackstein f0f41b6f95 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 13:23:51 +02:00
Michael Hackstein 74ce6ccc1a The ClusterMethods for document interaction (CRUD) now use automatic retries in cluster communication. 2016-04-22 13:23:44 +02:00
Jan Steemann 119f53c7a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 13:02:29 +02:00
Jan Steemann 143c2378af fixed leak 2016-04-22 13:01:32 +02:00
jsteemann 84e53cb40a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 12:37:06 +02:00
jsteemann 366cb659af fixed wrong options 2016-04-22 12:36:58 +02:00
Max Neunhoeffer f3cb1e2bc0 Implement synchronous replication for truncate. 2016-04-22 12:21:50 +02:00
Max Neunhoeffer 45d7ae567f Implement synchronous replication for replace and update. 2016-04-22 11:42:52 +02:00
Andreas Streichardt 3f1b75c99f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 11:22:20 +02:00
Andreas Streichardt 46b6561d78 Create planned collection in one transaction 2016-04-22 11:21:31 +02:00
jsteemann 32766eb984 fixed V8 context handling 2016-04-22 11:15:01 +02:00
jsteemann baaf59c291 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 09:29:15 +02:00
jsteemann 99e30dc6a3 fix statistics 2016-04-22 09:29:09 +02:00
Michael Hackstein 4a7dac947c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 09:27:24 +02:00
Michael Hackstein 00158f641e ShortestPath now uses mptr variant of operation cursor. Is even more performant. 2016-04-22 09:27:19 +02:00
jsteemann 08b8ca0833 fix uninitialized variable 2016-04-22 08:55:36 +02:00
jsteemann ad0a3f38b0 allow accessing /_admin/log in all databases 2016-04-22 08:41:39 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Frank Celler ac3a9883b9 restored log buffer feature 2016-04-21 21:07:23 -07:00
jsteemann 257663d017 removed unused file 2016-04-21 19:35:35 +02:00
Andreas Streichardt eebaffeeab Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 17:55:34 +02:00
Andreas Streichardt d58e3b5022 Remove useless move 2016-04-21 17:55:21 +02:00
Michael Hackstein 9a9781149d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 17:46:58 +02:00
Michael Hackstein d997f73c29 Removed all id splits in favor of string.find which is way faster. 2016-04-21 17:46:51 +02:00
Andreas Streichardt 2f72be9041 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 17:41:12 +02:00
Andreas Streichardt ef06a12e5d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 17:40:54 +02:00
Jan Steemann b02861c49b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-21 17:27:25 +02:00
Jan Steemann 2151ecce68 fixed crash 2016-04-21 17:27:12 +02:00
Michael Hackstein eeebfe94d8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 17:15:19 +02:00
Michael Hackstein cc542af656 Reactivated continuous neighbors searches after performance improvements. 2016-04-21 17:15:10 +02:00
Kaveh Vahedipour e980c74548 class Node out of Store.{h,cpp} 2016-04-21 17:11:44 +02:00
Kaveh Vahedipour 2d118944a7 Merge branch 'FMH' of https://github.com/arangodb/arangodb into devel 2016-04-21 17:02:34 +02:00
Kaveh Vahedipour 9aa8a3dcad Store no longer inherits from Node 2016-04-21 17:02:02 +02:00
Andreas Streichardt 24afe7a6ac Finally implement proper agent notification 2016-04-21 17:01:31 +02:00
Max Neunhoeffer 4aa0764ff5 Fix dropCollectionCoordinator. 2016-04-21 16:52:50 +02:00
Max Neunhoeffer db7041db1e Fix transaction management in AgencyComm. 2016-04-21 16:52:36 +02:00
Jan Steemann d5c2035b4a fixed leak 2016-04-21 15:51:40 +02:00
Max Neunhoeffer 6e08b056bb Merge branch 'FMH' into devel 2016-04-21 14:35:16 +02:00
Max Neunhoeffer fa99e47129 Fix a bug in traverser. 2016-04-21 14:30:14 +02:00
Kaveh Vahedipour 35b27663b0 class Node out of Store.{h,cpp} 2016-04-21 14:10:41 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Kaveh Vahedipour 307e4a31a0 class Node out of Store.{h,cpp} 2016-04-21 13:55:28 +02:00
Andreas Streichardt 917255fa28 Remove traces 2016-04-21 13:54:46 +02:00
Michael Hackstein 490905d188 Replaced an unordered set by a vector. The uniqueness is guaranteed by other mechanisms anyways. Further improved computationtime of Neighbors 2016-04-21 13:52:12 +02:00
Michael Hackstein 68691c6799 All Neighbors implementations now use the fastest variant. 2016-04-21 13:33:28 +02:00
Kaveh Vahedipour 5f552a5860 cppcheck warnings 2016-04-21 13:25:06 +02:00
Kaveh Vahedipour 87ee0c49d2 cppcheck warnings 2016-04-21 11:28:58 +02:00
Kaveh Vahedipour 1acb0cba6f agency/cluster startups seem correct 2016-04-21 11:19:07 +02:00
Max Neunhoeffer 80cd846702 Sort out start order of things w.r.t. cluster. 2016-04-21 11:13:11 +02:00
Michael Hackstein fe41af2257 Fixed a bug in Neighbors matchVertex. It aborted too early some times 2016-04-21 10:49:25 +02:00
Max Neunhoeffer ef01814127 Add servers entry to getCollectionInfoCurrent in JS. 2016-04-21 09:29:05 +02:00
Max Neunhoeffer 57842d1dc8 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-21 09:28:50 +02:00
jsteemann 6ccb2600bc use atomic variable instead of condition variable 2016-04-20 23:05:55 +02:00
jsteemann accb2cb33e added operator LIKE 2016-04-20 23:05:38 +02:00
Max Neunhoeffer f7bf3bdb40 Fix a cppcheck warning. 2016-04-20 22:38:19 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections 
Excluded Aardvark, the graph viewer in particular
 2016-04-20 22:09:00 +02:00
jsteemann f01c03a88e cppcheck 2016-04-20 21:39:19 +02:00
Kaveh Vahedipour 70528a9abd shifted critical mass logs to DEBUG 2016-04-20 16:07:38 +00:00
Kaveh Vahedipour b63393afc4 Merge branch 'FMH' of https://github.com/arangodb/arangodb into FMH 2016-04-20 15:46:15 +00:00
jsteemann 4a87925b41 fixed cluster start 2016-04-20 17:36:39 +02:00
Max Neunhoeffer 905a412952 Fix a typo. 2016-04-20 17:23:36 +02:00
Max Neunhoeffer aba651ad0d Better error handling. 2016-04-20 17:22:37 +02:00
Jan Steemann 80b0dc470e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-20 16:58:30 +02:00
Jan Steemann 57e40aa328 properly handle --wal.sync-interval 2016-04-20 16:58:14 +02:00
Michael Hackstein c1ad6dd5dd Added the improvement for OutboundNeighbors to Inbound and Any neighbors as well. For Any-Neighbors the effect is not too significant. 2016-04-20 16:49:34 +02:00
Kaveh Vahedipour 2637666698 cluster start on fmh succeeds, however slow 2016-04-20 16:12:48 +02:00
Max Neunhoeffer fdddf52e0a Fix maintainer mode compilation again. 2016-04-20 16:08:15 +02:00
Max Neunhoeffer 83f380aa2b Use vocbase. 2016-04-20 15:31:18 +02:00
Max Neunhoeffer cbd5f202bb Initialize ClusterInfo lib in cluster. 2016-04-20 15:31:08 +02:00
Michael Hackstein 6ee5e97a0f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 15:13:47 +02:00
Michael Hackstein ae80b86599 Added a function to request babies from an IndexIterator (next n elements). Used this function in OperationCursor to get a list of mptrs. The only Index supporting it right now is EdgeIndex. It is only used in OutboundNeighbors at this point. 2016-04-20 15:13:42 +02:00
Kaveh Vahedipour c575ff0467 Merge branch 'FMH' of https://github.com/arangodb/arangodb into FMH 2016-04-20 13:13:36 +00:00
Kaveh Vahedipour 72eb968d99 vobase is now acquired through server feature 2016-04-20 15:13:24 +02:00
Max Neunhoeffer b0d95461e7 Fix build in maintainer mode. 2016-04-20 14:51:32 +02:00
Kaveh Vahedipour b480155000 preparing merge back into deve 2016-04-20 14:42:32 +02:00
Max Neunhoeffer eacd5f504a Add dependency of features. 2016-04-20 14:16:48 +02:00
Max Neunhoeffer c35e3516c5 Implement synchronous replication for remove. 2016-04-20 13:37:55 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Max Neunhoeffer 6654eb03c6 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 13:20:22 +02:00
Max Neunhoeffer 10ce1b262f Fix synchronous replication. 2016-04-20 13:20:07 +02:00
Michael Hackstein 98995d8805 Improved Neighbors function, if there is no vertex example given. It will recognize earlier that there is nothing to check and will not fetch the real document. 2016-04-20 12:53:06 +02:00
Max Neunhoeffer 7a12918021 Fix agency startup. Agency not yet working. 2016-04-20 12:25:13 +02:00
Michael Hackstein 0cb3741e4f Fixed a bug in assoc multi. One result container was not handed in by reference. 2016-04-20 11:19:55 +02:00
jsteemann ef027dabaf added missing handler 2016-04-20 10:34:05 +02:00
Michael Hackstein 3407f4b111 The edge index now hands-in the result vector for doc mptr to AssocMulti. Also fixed the batch size for index lookups 2016-04-20 09:16:51 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann a5bbb8d084 allow using a few more bytes for indexed slice values 2016-04-19 23:34:39 +02:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
jsteemann a3b154043e removed unused typedef 2016-04-19 22:31:12 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Andreas Streichardt c738773f22 Include guards instead of #pragma once 2016-04-19 17:40:51 +02:00
Jan Steemann 0088fa2cbb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:38:55 +02:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +02:00
Max Neunhoeffer 1e6b346db7 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 16:17:57 +02:00
Max Neunhoeffer 2bfe7b8b24 Finishing touches to performRequests. 2016-04-19 16:17:41 +02:00
Jan Steemann be2ec7b9fc don't access allocatorThread when it's already destroyed 2016-04-19 16:08:32 +02:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Max Neunhoeffer 4382ac89d1 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 15:41:04 +02:00
Max Neunhoeffer ed41c310c1 Fix synchronous replication. 2016-04-19 15:40:51 +02:00
Max Neunhoeffer d1bea93518 Fix too short timeout in server shutdown /Current/Lock in agency. 2016-04-19 15:40:19 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Kaveh Vahedipour 0ed4c912b4 some wrong header declarations 2016-04-19 13:11:42 +00:00
Max Neunhoeffer 5c232edee2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 14:44:35 +02:00
Max Neunhoeffer 0d1a7239c1 Bugfixes for synchronous replication. 2016-04-19 14:44:23 +02:00
Michael Hackstein 7e6fd1561e Reverted usage of externals in Graph Functions. Commit was to early. Still warting for transparent handling of externals in VelocyPack 2016-04-19 14:42:17 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Kaveh Vahedipour 5eed7c8b44 some wrong header declarations 2016-04-19 12:15:20 +00:00
Max Neunhoeffer 9e43206513 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 13:25:31 +02:00
Jan Steemann 32082e30f0 use move 2016-04-19 13:20:13 +02:00
Michael Hackstein 36e608a5fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 12:32:54 +02:00
Michael Hackstein cf737639ba V8Traverser now uses externals in Slices instead of direct documents 2016-04-19 12:30:50 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Kaveh Vahedipour 2435dcc71b Outsourced config_t 2016-04-19 08:29:07 +00:00
Kaveh Vahedipour 2c1f9efc3b Outsourced config_t 2016-04-19 08:21:40 +00:00
Kaveh Vahedipour d97d23b8df naming and FMH merge perp 2016-04-19 07:59:51 +00:00
Max Neunhoeffer 168f3e0e7a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 08:55:11 +02:00
Kaveh Vahedipour 96ee5b6b60 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 08:41:08 +02:00
Kaveh Vahedipour 934b7ca107 cppcheck warnings 2016-04-19 08:40:56 +02:00
Frank Celler 75d3de2b31 fixed merge 2016-04-19 07:52:02 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Frank Celler f85c700d20 silence some warnings 2016-04-19 07:35:03 +02:00
jsteemann 9eb3036c2e fixed typo 2016-04-18 22:40:15 +02:00
Max Neunhoeffer dc7f855cfc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 19:59:22 +02:00
Simran Brucherseifer 097dcb0984 Minor corrections 2016-04-18 19:01:56 +02:00
Jan Steemann f686188d5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 18:11:36 +02:00
Jan Steemann aaf6176347 remove useless checks 2016-04-18 18:11:28 +02:00
Michael Hackstein 22b6f3f7b0 CPPCheck improvements 2016-04-18 17:36:02 +02:00
Max Neunhoeffer 16769c59b4 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 16:24:28 +02:00
Kaveh Vahedipour 114b643d6e cluster startup and supervision 2016-04-18 16:13:30 +02:00
Kaveh Vahedipour 313140e0e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:27:31 +02:00
Kaveh Vahedipour 3cf55c5e3e cluster startup and supervision 2016-04-18 15:27:23 +02:00
Jan Steemann 881f13e13b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:09:50 +02:00
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +02:00
Max Neunhoeffer 7a8daa35cb Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 13:47:38 +02:00
Max Neunhoeffer e9f2276f0c Finish insert case of synchronous replication. 2016-04-18 13:47:20 +02:00