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

1735 Commits

Author SHA1 Message Date
Max Neunhoeffer 85ef2ec94c Remove test for removed precondition. 2017-05-03 11:02:24 +02:00
Max Neunhoeffer 461b8d6900 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-05-03 10:52:27 +02:00
Max Neunhoeffer 4090f7422b Take out precondition in createCollectionCoordinator. 2017-05-03 10:52:01 +02:00
Kaveh Vahedipour 41e8e0220d fixed bug in shard numbering 2017-05-03 10:47:04 +02:00
Max Neunhoeffer 1b0e976a55 Fix ignoreDistributeShardsLikeErrors behaviour. 2017-05-03 09:13:03 +02:00
jsteemann 45096dd503 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-02 16:09:35 +02:00
Michael Hackstein cf12573507 Removed code paths that wrote objectIds into the Agency. This did break replication. 2017-05-02 14:59:19 +02:00
jsteemann 910f5680b0 moved files 2017-05-02 12:34:28 +02:00
Andreas Streichardt 74b721481c Wait for cluster sync when creating collections 2017-04-27 17:46:41 +02:00
Andreas Streichardt c47505d514 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-27 15:59:11 +02:00
Andreas Streichardt 2f6c391d9b move useless string to where it belongs 2017-04-27 15:04:08 +02:00
Kaveh Vahedipour 1109c7b54e typo 2017-04-27 10:43:02 +02:00
Kaveh Vahedipour e778604cef distributeShardsLike is not ignored when prototype does not exist 2017-04-27 10:38:07 +02:00
Kaveh Vahedipour 0d96ba4f4b merge from 3.1 2017-04-26 12:06:43 +02:00
Kaveh Vahedipour 8f2fbd6b3c Fix compile bug 2017-04-26 10:27:52 +02:00
Kaveh Vahedipour 5f7cc6de59 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:20:27 +02:00
Kaveh Vahedipour 7aceac2f56 ClusterComm cherry pick from 3.1 2017-04-26 10:20:21 +02:00
Max Neunhoeffer ed13ee7973 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-26 10:10:06 +02:00
Max Neunhoeffer 17a88ddbf8 Port 3.1 fixes to devel, add an access method. 2017-04-26 10:09:47 +02:00
Andreas Streichardt 42577df48d remove useless variable 2017-04-26 10:07:51 +02:00
Andreas Streichardt ed0e9fdc8e Set waiting to false until tests are changed 2017-04-26 09:57:40 +02:00
Andreas Streichardt dad5a1429e Add waitForSyncReplication as a _create() option 2017-04-26 09:57:40 +02:00
Kaveh Vahedipour d88f990ad0 dropping sharding prototype collection more verbose 2017-04-25 14:17:08 +02:00
Kaveh Vahedipour 999334e366 dropping sharding prototype collection more verbose 2017-04-25 14:13:07 +02:00
Kaveh Vahedipour bf67189d98 dropping sharding prototype collection more verbose 2017-04-25 14:11:44 +02:00
Kaveh Vahedipour 1361e5e6dd dropping sharding prototype collection more verbose 2017-04-25 14:03:26 +02:00
Kaveh Vahedipour f0f40b6e8d dropping sharding prototype collection more verbose 2017-04-25 13:59:56 +02:00
Kaveh Vahedipour 2e3bd066f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 08:54:45 +02:00
Kaveh Vahedipour 6ef775e52f fix bug with ioService gone before hearbeatthread 2017-04-25 08:54:33 +02:00
jsteemann a52a6ff21e unused variable 2017-04-25 02:26:02 +02:00
jsteemann ca5d54aa58 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 00:03:05 +02:00
Max Neunhoeffer e16f9ca7c5 Add check for distributeShardsLike to dropCollectionCoordinator. 2017-04-24 23:54:07 +02:00
jsteemann d1cad2acc9 cppcheck 
fix
 2017-04-24 23:06:36 +02:00
Michael Hackstein bce4b9ef5d Fixed unnecessary move of temporary object 2017-04-24 18:31:18 +02:00
Michael Hackstein 8596cec20b Fixed TraversalCounting in cluster again. Was removed by accident from totally unrelated commit 2017-04-24 16:58:21 +02:00
Kaveh Vahedipour a514649132 fixed exterprise build in devel 2017-04-24 16:33:53 +02:00
Simon Grätzer fe84b499c0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-04-24 15:45:39 +02:00
Simon Grätzer 7176d34169 Fixed incremental synced 2017-04-24 15:40:48 +02:00
Kaveh Vahedipour ccc388a940 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:13:40 +02:00
Kaveh Vahedipour c099c6daa9 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:12:38 +02:00
Michael Hackstein 851f772dc1 Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +02:00
jsteemann c0995c7328 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:08:00 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Michael Hackstein 3b34d4edec Unified static-counting for Traversals on the Cache 2017-04-21 15:58:44 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann 691dac7a73 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 12:35:07 +02:00
Kaveh Vahedipour 2dbd179656 Fix ocasionally hangling shut down on mac 2017-04-21 11:49:22 +02:00
Simon Grätzer 98df9c21a2 Fixing warnings 2017-04-20 19:07:30 +02:00
Simon Grätzer ec848b879f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 18:50:57 +02:00
Simon Grätzer b304d35ac2 Added rocksdb background thread 2017-04-20 18:50:52 +02:00