Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # arangod/Aql/FunctionDefinitions.cpp # arangod/Aql/Functions.h # arangod/Utils/ExplicitTransaction.h		2017-02-10 15:21:24 +01:00
..
assets/swagger	Make swagger docs secure again	2016-06-17 14:52:15 +02:00
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-02-10 15:21:24 +01:00
perftests	…
tests	fix typo	2017-02-10 10:53:13 +01:00
arango-dfdb.js	…
check-version.js	…
initialize.js	…
restore-admin-user.js	secure-installation will remove all users except root	2016-06-12 12:19:37 +02:00
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	…