1
0
Fork 0
arangodb/arangod
Simon Grätzer 6472d7cc94 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCollection.cpp
2017-05-15 17:36:09 +02:00
..
Actions
Agency Fix rolling back of indices 2017-05-15 15:48:01 +02:00
Aql speed up comparisons a bit 2017-05-15 14:35:37 +02:00
Cache re-set fillgrades back to original values 2017-05-15 16:47:41 +02:00
Cluster Add test for rolling back indexes 2017-05-15 16:49:07 +02:00
GeneralServer Squashed commit of the following: 2017-05-12 23:22:22 +02:00
Graph Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +02:00
Indexes Removed code paths that wrote objectIds into the Agency. This did break replication. 2017-05-02 14:59:19 +02:00
InternalRestHandler Integreated a ShortestPathEngine on DBServers and wired it up with ShortestPathNode and Options. The path seems to be computed correctly in clsuter now, but the vertices are not yet retrieved. 2017-04-20 13:57:14 +02:00
MMFiles Squashed commit of the following: 2017-05-12 23:22:22 +02:00
Pregel Little changes for SLPA support 2017-05-15 10:42:25 +02:00
Replication attempt to fix races in replication 2017-05-10 14:32:16 +02:00
Rest added --console 2016-04-10 13:47:53 +02:00
RestHandler Squashed commit of the following: 2017-05-12 23:22:22 +02:00
RestServer remove obsolete Dispatcher feature from list 2017-05-15 15:14:52 +02:00
RocksDBEngine Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-15 17:36:09 +02:00
Scheduler change feature order around 2017-05-10 14:29:20 +02:00
Statistics raised statistics entries 2017-04-26 09:54:14 +02:00
StorageEngine improve error messages 2017-05-15 15:03:52 +02:00
Transaction removing unused and unimplemented methods 2017-05-10 18:25:41 +02:00
Utils preparation for RocksDB logger 2017-05-09 12:42:25 +02:00
V8Server Squashed commit of the following: 2017-05-12 23:22:22 +02:00
Views added ViewIterator.h 2017-05-04 02:01:00 +02:00
VocBase Rocksb: index locking issue 2017-05-11 15:12:05 +02:00
CMakeLists.txt Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-13 01:08:28 +02:00
dbg.cmake