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
..
RestoreFeature.cpp	Multihreaded import	2017-05-24 18:37:45 +02:00
RestoreFeature.h	more dictributeShardsLike code mergedfrom 3.1	2017-04-24 15:12:38 +02:00
arangorestore.cpp	moved shell colors into their own feature	2017-05-23 16:53:43 +02:00