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
..
AsyncJobManager.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
AsyncJobManager.h	…
AuthenticationFeature.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
AuthenticationFeature.h	…
GeneralCommTask.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
GeneralCommTask.h	fix typo	2017-02-06 17:38:36 +01:00
GeneralDefinitions.h	…
GeneralListenTask.cpp	…
GeneralListenTask.h	…
GeneralServer.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
GeneralServer.h	added reactor type	2017-02-07 12:41:41 +01:00
GeneralServerFeature.cpp	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 15:21:24 +01:00
GeneralServerFeature.h	…
HttpCommTask.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
HttpCommTask.h	…
RestEngine.cpp	…
RestEngine.h	better threads working handling	2017-02-06 16:32:55 +01:00
RestHandler.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
RestHandler.h	…
RestHandlerFactory.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
RestHandlerFactory.h	…
RestStatus.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
RestStatus.h	…
VppCommTask.cpp	…
VppCommTask.h	…
VppNetwork.h	…