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
..
assets/swagger	…
bootstrap	fix misleading init messages	2017-03-24 09:49:57 +01:00
modules/@arangodb	Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api	2017-04-13 17:48:52 +02:00
perftests	…
tests	Fixing last two recovery tests	2017-04-13 10:45:52 +02:00
arango-dfdb.js	…
check-version.js	…
initialize.js	…
restore-admin-user.js	…
server.js	Use COLOR_OUTPUT to determine whether to use color	2017-03-15 20:44:03 +01:00
upgrade-database.js	re-add index	2017-04-05 12:31:37 +02:00
worker.js	…