3 Commits

Author	SHA1	Message	Date
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
Max Neunhoeffer	298b9ffc3b	Add AQLFeature.	2017-02-09 11:57:51 +01:00
Michael Hackstein	dfc9f29e69	Moved FunctionDefinitions to an AqlFunctionFeature. This now has a defined startup ordering	2017-02-08 15:45:59 +01:00