Simon Grätzer 871272d7c1 Merge from devel		2017-03-12 12:32:22 +01:00
..
Actions	No need for forward declaration as include is there anyway (and	2017-02-13 15:53:08 +01:00
Agency	should not overimplement LoggerStream. allows unified behaviour of std::cout and LOG_TOPIC(.,.)	2017-03-01 11:51:27 +01:00
Aql	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-08 18:20:44 +01:00
Cache	Fixed a compile bug.	2017-03-11 13:22:07 -05:00
Cluster	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-08 18:20:44 +01:00
GeneralServer	Merge from devel	2017-03-12 12:32:22 +01:00
Indexes	Revert "another attempt to fix logger issues"	2017-03-06 14:30:42 +01:00
InternalRestHandler	fix velocypack-over-HTTP responses	2017-02-28 17:01:59 +01:00
MMFiles	class renaming	2017-03-08 17:54:00 +01:00
Pregel	Added memory mapped file	2017-03-12 00:46:54 +01:00
Replication	Moved the decision to write a marker into the databaseFeature, it is not triggered from outside any more. Furthermore renameCollection write marker is now done in MMFiles.	2017-03-08 14:54:25 +01:00
Rest	…
RestHandler	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-08 18:20:44 +01:00
RestServer	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-08 18:20:44 +01:00
Scheduler	ensure that JobGuards are started and ended in the same thread	2017-02-27 22:41:58 +01:00
Statistics	fixed negative counting of http connection in UI	2017-02-23 09:59:49 +01:00
StorageEngine	Moved the decision to write a marker into the databaseFeature, it is not triggered from outside any more. Furthermore renameCollection write marker is now done in MMFiles.	2017-03-08 14:54:25 +01:00
Transaction	remove dependency on MMFilesLogfileManager	2017-03-01 15:50:10 +01:00
Utils	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-07 15:08:06 +01:00
V8Server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-08 18:20:44 +01:00
VocBase	Merge from devel	2017-03-12 12:32:22 +01:00
CMakeLists.txt	Merge from devel	2017-03-12 12:32:22 +01:00
dbg.cmake	streamline import process; fix arangoexport	2017-02-20 15:35:34 +01:00