Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # scripts/startLocalCluster.sh		2016-12-09 14:30:19 +01:00
..
bootstrap	Wait for synchronous replication to settle	2016-12-07 18:38:15 +01:00
modules	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 14:30:19 +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	added optional memory limit for AQL queries	2016-12-06 13:23:41 +01:00