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

39481 Commits

Author SHA1 Message Date
Michael Hackstein 6cfa55ac6c Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-04-24 13:54:42 +02:00
jsteemann 507054de99 adjust include order 2017-04-24 13:50:54 +02:00
Michael Hackstein 54c857ed74 Adapted statistics in tests for SinlgeServer Traversal. 2017-04-24 13:22:42 +02:00
jsteemann fcc61115d8 try to fix feature startup order (Scheduler vs. CacheManager vs. DatabaseFeature) 2017-04-24 13:17:21 +02:00
Wilfried Goesgens d90c8b0662 one more attempt to fix the LICENSE install macro 2017-04-24 13:14:52 +02:00
Michael Hackstein f9e2535714 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-24 13:08:05 +02:00
Michael Hackstein 6eab0b4f20 Fixed JSLint 2017-04-24 13:07:52 +02:00
Simon Grätzer 6109329ef5 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 12:46:08 +02:00
baslr 3d9f58bb70 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 12:45:35 +02:00
Michael Hackstein e33c8b76a2 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-24 12:45:31 +02:00
Michael Hackstein 1d52eb8afe Adapted cluster-hash-index tests for RocksDB. 2017-04-24 12:45:21 +02:00
Simon Grätzer 06fea9dbf4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 12:43:55 +02:00
Simon Grätzer 88dc999001 Counter manager fixes 2017-04-24 12:43:44 +02:00
Max Neunhoeffer 4151087273 Fix some duplicated options. 2017-04-24 12:22:29 +02:00
Kaveh Vahedipour a464347911 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-24 11:51:45 +02:00
Kaveh Vahedipour 97c9198b4d ipv4 is so yesterday 2017-04-24 11:51:38 +02:00
Jan Christoph Uhde 2269ca7b0a add batchId and logging 2017-04-24 11:47:54 +02:00
Kaveh Vahedipour 733d7260eb startRocksdbCluster.sh has gone in favour of a simple flag in startLocalCluster.sh 2017-04-24 11:34:54 +02:00
Wilfried Goesgens 7cbd1841a8 fix gcc 4.9 compilation issue 2017-04-24 11:25:10 +02:00
jsteemann 603cc849b9 fix attempt for @dothebart'a ancient compiler 2017-04-24 11:12:08 +02:00
Kaveh Vahedipour b96f3be332 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-24 11:08:15 +02:00
Kaveh Vahedipour a211e5ee83 ipv4 is so yesterday 2017-04-24 11:08:04 +02:00
Max Neunhoeffer 6b67f0a550 Revert "Add -r option for rocksDB engine to startLocalCluster.sh" 
This reverts commit 1f842312f5.
 2017-04-24 11:07:04 +02:00
Max Neunhoeffer c5b21cdbd5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-04-24 10:57:25 +02:00
Max Neunhoeffer 1f842312f5 Add -r option for rocksDB engine to startLocalCluster.sh 2017-04-24 10:57:06 +02:00
Kaveh Vahedipour 09a6888d14 attempt at fixing shutdown bug on mac os x 2017-04-24 10:45:54 +02:00
Michael Hackstein 9b15e1a913 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-24 10:44:06 +02:00
Michael Hackstein 851f772dc1 Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +02:00
Simon Grätzer df57b291f8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 10:23:33 +02:00
jsteemann a32c2e84d4 use adjusted write options on commit 2017-04-24 09:39:35 +02:00
jsteemann 31c9e04ae6 fixed memleak 2017-04-22 00:28:45 +02:00
jsteemann 07637136d9 validate enterprise too 2017-04-21 20:33:06 +02:00
jsteemann c197d617d9 proper file order 2017-04-21 20:32:56 +02:00
jsteemann ea8496f1a5 cppcheck 2017-04-21 20:19:36 +02:00
jsteemann 14b8a839d1 also validate testing.js 2017-04-21 20:11:31 +02:00
Dan Larkin 7c49b6bdd4 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 13:12:25 -04:00
Dan Larkin d7f56172fd Fixed a status return in replication handler. 2017-04-21 13:12:19 -04:00
jsteemann d0fae3cf7b savepoint optimizations 2017-04-21 18:23:47 +02:00
jsteemann b24f4a9435 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:14:31 +02:00
Simon Grätzer 1265fb759c Merge + sync 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationContext.h
 2017-04-21 18:11:01 +02:00
Simon Grätzer e850dd635a Incremental sync 2017-04-21 18:10:10 +02:00
Andreas Streichardt 3bf2627f57 Remove ifdefs for non linuxes 2017-04-21 18:10:09 +02:00
Andreas Streichardt 7322e3bff3 Allow seeding of randomgenerator for tests 2017-04-21 18:08:49 +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 d72762cbdd fix default ssl protocol in yet another place 2017-04-21 18:07:40 +02:00
Dan Larkin 734921f003 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 11:52:07 -04:00
Dan Larkin 557eddb912 Added batchSize support to collection dumping. 2017-04-21 11:51:56 -04:00
Michael Hackstein ac90968c30 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 17:40:18 +02:00
Kaveh Vahedipour f9259b4677 arangodump to warn of missing prototype collection 2017-04-21 17:03:29 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00