Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # 3rdParty/V8/v8 # arangod/Transaction/Methods.h # arangod/Utils/UserTransaction.h # arangod/V8Server/v8-collection.cpp		2017-03-01 14:52:35 +01:00
..
assets/swagger	…
bootstrap	Do not start up if replication failed	2017-02-08 16:18:41 +01:00
modules/@arangodb	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-01 14:52:35 +01:00
perftests	…
tests	some final cleanup	2017-02-21 13:04:24 +01:00
arango-dfdb.js	…
check-version.js	…
initialize.js	…
restore-admin-user.js	…
server.js	Implement process.stdout.isTTY	2016-11-19 18:42:29 +01:00
upgrade-database.js	moved to debug log level	2017-02-02 16:00:48 +01:00
worker.js	…