1
0
Fork 0
arangodb/arangod
Simon Grätzer e0e00b0b6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
2017-04-13 17:48:52 +02:00
..
Actions make number of v8 contexts dynamic. start with just 1 or 2 contexts 2017-03-10 17:59:44 +01:00
Agency Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result 2017-03-30 19:46:17 +02:00
Aql Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Cache Fixed issue with cache transactions. 2017-04-07 16:58:22 -04:00
Cluster Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-13 14:36:01 +02:00
GeneralServer added message id to debug output 2017-03-24 09:57:07 +01:00
Graph Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Indexes fix rocksdb engine index reporting but break report for mmfiles engine 2017-04-12 14:50:55 +02:00
InternalRestHandler Revert "Squashed commit. Moved over SmartSearch Shortest Path feature" 2017-03-24 18:23:20 +01:00
MMFiles Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Pregel moved class around 2017-04-07 13:13:48 +02:00
Replication Add a timeout option to <collection>.drop(). 2017-04-07 15:52:19 +02:00
Rest
RestHandler Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
RestServer Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 17:26:39 +02:00
RocksDBEngine Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-13 17:48:52 +02:00
Scheduler fixed shutdown issue 2017-04-05 10:43:05 +02:00
Statistics generalize usleep argument 2017-03-16 16:27:40 +01:00
StorageEngine add engine capabilities 2017-04-06 14:50:27 +02:00
Transaction moved class around 2017-04-07 13:13:48 +02:00
Utils moved class around 2017-04-07 13:13:48 +02:00
V8Server Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-13 17:48:52 +02:00
Views Added partialUpdate flag for view property modification. 2017-03-30 12:04:58 -04:00
VocBase Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
CMakeLists.txt Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
dbg.cmake streamline import process; fix arangoexport 2017-02-20 15:35:34 +01:00