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
jsteemann c0348c2840 more fixes 2017-04-20 23:23:04 +02:00
jsteemann 980e357bb3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 23:15:08 +02:00
jsteemann 493154a319 fix inventory when there is no batchId 2017-04-20 23:14:58 +02:00
Dan Larkin 9fad094403 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 17:12:19 -04:00
Dan Larkin c8f87d0b62 Split dump test file (engine-specific values). 2017-04-20 17:12:15 -04:00
jsteemann 6abc9c62f2 fixed after merge conflict 2017-04-20 23:05:14 +02:00
jsteemann 467a90f749 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 23:02:33 +02:00
jsteemann 84f1a012b9 some bugfixes 2017-04-20 22:59:35 +02:00
Dan Larkin f45d46d087 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 16:27:11 -04:00
Dan Larkin b7f8854666 Made some progress on dump tests. 2017-04-20 16:23:35 -04:00
jsteemann 409ce6fccf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 22:15:29 +02:00
jsteemann 27f58d0675 prepare for some optimization 2017-04-20 22:15:10 +02:00
jsteemann 2994988210 attempt to fix broken graph stuff 2017-04-20 22:14:30 +02:00
jsteemann f5009099cf cppcheck 2017-04-20 21:48:01 +02:00
Dan Larkin 6b67470dbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 14:59:55 -04:00
Dan Larkin 57701ff766 Added (rough) logger-follow handler. 2017-04-20 14:59:49 -04:00
Frank Celler 0d71aaeb9d fix for compiler path 2017-04-20 20:53:04 +02:00
Simon Grätzer 2235a70e62 Fix shutdown 2017-04-20 19:17:13 +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
Michael Hackstein 9d621d1ffd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 18:08:53 +02:00
Michael Hackstein 24992be707 Removed an assertion of PrimaryIndex toVelocyPack. The case i was tackeling was writing the index-information as an attribtue into an object, which was not allowed by this assertion, but actually it is. 2017-04-20 17:49:26 +02:00
jsteemann 16dce86bee updated CHANGELOG entry for geo indexes 2017-04-20 17:30:20 +02:00
jsteemann f4d889d697 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 17:21:50 +02:00
jsteemann d776b9f40f removed unused code 2017-04-20 17:21:41 +02:00
jsteemann 296342b892 renamed a few tests 2017-04-20 17:21:34 +02:00
Michael Hackstein e3febed2b5 ShortestPath and TraversalNode now call GraphNode::toVelocyPack as expected, not the Base ExecuteionNode::toVelocypackGeneric by accident 2017-04-20 17:19:30 +02:00
Michael Hackstein aed9a528fc Added WITH collection to ShortestPath-Tests 2017-04-20 17:18:46 +02:00
Dan Larkin 973b410698 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 11:10:13 -04:00
Dan Larkin 4ec2a40cd5 Split replication context/status/tailing. 2017-04-20 11:10:08 -04:00
Simon Grätzer 7e8624d9d4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 17:01:16 +02:00
Jan Christoph Uhde eb9728f159 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  cppcheck
 2017-04-20 17:00:48 +02:00
Jan Christoph Uhde c7b6e51313 add geo index entry to change log 2017-04-20 17:00:20 +02:00
jsteemann 569450321d cppcheck 2017-04-20 16:47:10 +02:00
Simon Grätzer 67c4776ce8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 16:39:22 +02:00
Simon Grätzer 502dc66697 Make some methods const 2017-04-20 16:39:18 +02:00
Michael Hackstein e51aa69d4a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 16:35:42 +02:00
Michael Hackstein 3dc03d01b2 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 16:35:34 +02:00
baslr 6966b7e1d3 remove old ldap cmake configs 2017-04-20 16:08:02 +02:00
Jan Christoph Uhde f96d197cfc Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed bug/warning.
  formatting
 2017-04-20 16:02:43 +02:00
Jan Christoph Uhde 96b05c0f61 work on dump for rocksdb replication 2017-04-20 15:58:48 +02:00
Michael Hackstein 4e54c7365b Adapted SHORTEST_PATH unittest to include WITH statements 2017-04-20 15:58:28 +02:00
baslr 9d6d781425 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-20 15:58:08 +02:00
Michael Hackstein 89e3480e1f Updated CHANGELOG. Clustered ShortestPath queries now require to explicitly name all Vertex Collections that can be encountered during the search in the AQL statement in order to avoid cluster deadlocks. 2017-04-20 15:58:02 +02:00
Michael Hackstein 1619e6b3d8 First version of ShortestPath that is presumably working in Clustered Mode with MMFiles and RocksDB 2017-04-20 15:57:06 +02:00
Dan Larkin 2cf8cc79e8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 09:52:03 -04:00
Dan Larkin 6da43d4171 Fixed bug/warning. 2017-04-20 09:51:52 -04:00
jsteemann c78699f5ea formatting 2017-04-20 15:50:23 +02:00
jsteemann 3d938a037b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 15:42:22 +02:00