Jan Christoph Uhde 85e438ee00 Merge remote-tracking branch 'origin/devel' into engine-api		2017-03-22 14:47:42 +01:00
..
Actions	…
Agency	fix slow queries	2017-03-22 11:20:07 +01:00
Aql	…
Cache	…
Cluster	fixed two cluster tests	2017-03-22 14:03:27 +01:00
GeneralServer	added db._engine()	2017-03-22 11:19:31 +01:00
Indexes	index API change	2017-03-20 14:40:54 +01:00
InternalRestHandler	…
MMFiles	fixed failing test	2017-03-22 14:46:10 +01:00
Pregel	Pregel: Changed scheduler post call	2017-03-20 12:22:16 +01:00
Replication	…
Rest	…
RestHandler	added db._engine()	2017-03-22 11:19:31 +01:00
RestServer	Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api	2017-03-22 12:26:10 +01:00
RocksDBEngine	Add functon to create slices from RocksDBEntryTypes	2017-03-22 14:45:54 +01:00
Scheduler	try to fix shutdown races	2017-03-22 08:31:49 +01:00
Statistics	…
StorageEngine	Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api	2017-03-22 12:26:10 +01:00
Transaction	…
Utils	move collection keys into engine	2017-03-21 14:23:29 +01:00
V8Server	renaming	2017-03-22 13:01:40 +01:00
Views	…
VocBase	renaming	2017-03-22 13:01:40 +01:00
CMakeLists.txt	Add functon to create slices from RocksDBEntryTypes	2017-03-22 14:45:54 +01:00
dbg.cmake	…