Simon Grätzer d71ebf7c1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel		2017-01-20 14:42:19 +01:00
..
bootstrap	agency bug in precondition and log handling fixed	2017-01-18 11:07:30 +01:00
modules	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-01-20 14:42: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	Merge branch 'devel' of github.com:arangodb/arangodb into devel	2017-01-10 15:39:12 +01:00