Simon Grätzer 36503af230 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # arangod/RocksDBEngine/RocksDBReplicationTailing.cpp		2017-05-24 18:38:34 +02:00
..
BenchFeature.cpp	improved error messages	2017-04-07 10:40:25 +02:00
BenchFeature.h	added --replication-factor, --number-of-shards and --wait-for-sync to arangobench	2017-01-18 17:51:03 +01:00
BenchmarkCounter.h	renamed arangob to arangobench	2016-04-27 12:15:19 +02:00
BenchmarkOperation.h	finish RequestType enum	2016-08-23 14:49:29 +02:00
BenchmarkThread.h	Multihreaded import	2017-05-24 18:37:45 +02:00
arangobench.cpp	moved shell colors into their own feature	2017-05-23 16:53:43 +02:00
test-cases.h	use exclusive locks	2017-04-07 14:56:28 +02:00