Jan Christoph Uhde 9131cde18b Merge branch 'devel' of github.com:arangodb/arangodb into devel ... * 'devel' of github.com:arangodb/arangodb: fix another merge conflict fix compile error after merge remove logging for non-topics Destroy all traverser engines when AQL is shut down.		2017-02-10 10:58:07 +01:00
..
DocumentIdentifierToken.h	The Fulltext index now return DocumentIdentifierTokens instead of revisions. Removed one inderection rid <-> Index_doc which were a typedef.	2017-01-25 13:20:15 +01:00
EngineSelectorFeature.cpp	rebase database-management	2017-02-09 18:47:20 +01:00
EngineSelectorFeature.h	fix startup	2016-11-17 17:18:18 +01:00
RocksDBEngine.cpp	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 09:34:55 +01:00
RocksDBEngine.h	clean up headers	2017-02-10 10:57:51 +01:00
RocksDBIndexFactory.cpp	Moved major Index-creation out of LogicalCollection into the StorageEngine Specific IndexFactory.	2017-01-29 15:08:26 +01:00
RocksDBIndexFactory.h	Moved major Index-creation out of LogicalCollection into the StorageEngine Specific IndexFactory.	2017-01-29 15:08:26 +01:00
StorageEngine.h	clean up headers	2017-02-10 10:57:51 +01:00
TransactionCollection.cpp	added convenience method collectionName	2017-02-07 12:05:36 +01:00
TransactionCollection.h	move engine-specific things out of public API	2017-02-07 17:36:53 +01:00
TransactionState.cpp	remove logging for non-topics	2017-02-10 09:32:50 +01:00
TransactionState.h	move some MMFiles-specific things into MMFiles directory	2017-02-07 16:38:04 +01:00