1
0
Fork 0
arangodb/arangod/VocBase
Jan Christoph Uhde ce3b1ff9b5 Merge branch 'obi-storage' into devel
* obi-storage:
  move compation locking / figures out of logical collection

Conflicts:
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.h
2017-02-14 16:14:25 +01:00
..
AccessMode.h refactoring 2017-01-27 15:57:22 +01:00
AuthInfo.cpp remove logging for non-topics 2017-02-10 09:32:50 +01:00
AuthInfo.h Squashed commit of the following: 2016-10-24 10:18:30 +02:00
CompactionLocker.h move compation locking / figures out of logical collection 2017-02-14 12:34:46 +01:00
DatafileStatisticsContainer.cpp moved _datafileStatistics into engine 2016-08-26 16:22:41 +02:00
DatafileStatisticsContainer.h moved _datafileStatistics into engine 2016-08-26 16:22:41 +02:00
Ditch.cpp remove logging for non-topics 2017-02-10 09:32:50 +01:00
Ditch.h renaming 2017-01-16 14:48:13 +01:00
EdgeCollectionInfo.cpp potential fixes for MSVC 2017-02-14 16:01:00 +01:00
EdgeCollectionInfo.h renaming 2017-02-13 15:18:40 +01:00
Graphs.cpp try to fix compile error 2017-01-31 16:12:16 +01:00
Graphs.h lookupGraphByName now has a non-enterprise implementation. 2016-09-14 10:55:01 +02:00
KeyGenerator.cpp performance optimizations 2016-11-09 14:46:50 +01:00
KeyGenerator.h performance optimizations 2016-11-09 14:46:50 +01:00
LogicalCollection.cpp Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
LogicalCollection.h Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
ManagedDocumentResult.h remove revisions cache 2017-01-24 10:48:07 +01:00
PathEnumerator.cpp performance optimization 2016-10-26 12:04:27 +02:00
PathEnumerator.h fix size_t vs uint64_t confusion 2017-02-10 23:43:47 +01:00
PhysicalCollection.cpp Moved engine specific logic of Document Remove from Logical To Physical Collection 2017-02-14 10:20:32 +01:00
PhysicalCollection.h Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
SingleServerTraverser.cpp renaming 2017-02-13 15:18:40 +01:00
SingleServerTraverser.h renaming 2017-02-13 15:18:40 +01:00
TransactionManager.cpp factored out transaction manager from logfile manager 2017-01-23 12:31:45 +01:00
TransactionManager.h factored out transaction manager from logfile manager 2017-01-23 12:31:45 +01:00
Traverser.cpp potential fixes for MSVC 2017-02-14 16:01:00 +01:00
Traverser.h moved helper classes into their own file 2017-02-14 12:35:34 +01:00
TraverserOptions.cpp renaming 2017-02-13 15:18:40 +01:00
TraverserOptions.h renaming 2017-02-13 15:18:40 +01:00
modes.cpp
modes.h
replication-applier.cpp refactoring 2017-02-07 14:36:03 +01:00
replication-applier.h renaming 2017-02-13 15:18:40 +01:00
replication-common.cpp remove includes 2016-08-26 10:18:30 +02:00
replication-common.h
replication-dump.cpp move compation locking / figures out of logical collection 2017-02-14 12:34:46 +01:00
replication-dump.h more vpp changes for restReplicationHandler 2016-09-07 12:07:07 +02:00
ticks.cpp fixes for tick handling 2016-10-24 15:20:45 +02:00
ticks.h
voc-types.h Change undocumented behaviour in case of invalid rev in JS document ops. 2017-02-08 10:59:04 +01:00
vocbase.cpp Renamed collection->update() to update the properties of a collection to collection->updateProperties(). There is another update() which is used for the stored Documents. 2017-02-14 10:32:24 +01:00
vocbase.h try to fix compile warnings in non-maintainer mode 2016-09-27 13:31:17 +02:00