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

39058 Commits

Author SHA1 Message Date
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
Kaveh Vahedipour 2163055175 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-21 16:10:24 +02:00
Michael Hackstein 3b34d4edec Unified static-counting for Traversals on the Cache 2017-04-21 15:58:44 +02:00
Wilfried Goesgens bc57289cfd add missing files for ArangoDBStarter documentation 2017-04-21 15:57:28 +02:00
Kaveh Vahedipour d5a8269d57 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-21 15:47:09 +02:00
Kaveh Vahedipour 42caf5044c merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:47:03 +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 dbe5aec4aa Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:31:13 +02:00
jsteemann efefb87d70 jslint 2017-04-21 15:30:53 +02:00
jsteemann 03585460a8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:28:45 +02:00
jsteemann 361d513087 re-enable user settings for RocksDB 2017-04-21 15:28:29 +02:00
Wilfried Goesgens 3a1e65d53f add test whether append to NULL works 2017-04-21 15:23:54 +02:00
jsteemann 62d0bb36d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:17:43 +02:00
Wilfried Goesgens 5125f3e70a fix snap package filename 2017-04-21 15:13:14 +02:00
Wilfried Goesgens 2b77bfcaaa fix snap package filename 2017-04-21 15:13:01 +02:00
Michael Hackstein e46642fce1 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 15:06:42 +02:00
Michael Hackstein aa2abe0c1d Fixed a bug in TraverserOptions when using more than one edge collection and a specific filter on depth. 2017-04-21 15:06:24 +02:00
Wilfried Goesgens cb54938582 also try to detect the icu database in its absolute install directory 2017-04-21 14:22:56 +02:00
jsteemann 0444a5a068 disable usage of (bad) default values 2017-04-21 14:02:50 +02:00
jsteemann 59ee7e821b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 13:42:04 +02:00
Wilfried Goesgens 1f1611a278 fix the location for README and LICENSE - remove wrong escape 2017-04-21 13:25:39 +02:00
Wilfried Goesgens 5ef33d1467 fix the location for README and LICENSE 2017-04-21 13:24:18 +02:00
Wilfried Goesgens 3d418362d2 respect the install prefix for the systemd unit file anyways. 2017-04-21 13:23:50 +02:00
jsteemann b33390c1d4 remove log spam 2017-04-21 13:21:38 +02:00
Simon Grätzer ff4f8181dd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 13:00:36 +02:00
Simon Grätzer 235f006a27 const collection CRUD methods 2017-04-21 13:00:30 +02:00
Simon Grätzer 064c51c731 Adding const statements 2017-04-21 12:59:20 +02:00