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
..
bootstrap	added support for topic logging	2017-02-02 16:00:37 +01:00
modules	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-01-27 15:58:22 +01:00
test-data	fix error message returned by arangoimp in case of some secondary unique key constaint violations	2016-12-02 13:37:17 +01:00
tests	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 15:21:24 +01:00