Andreas Streichardt 59b49485b5 Merge branch 'devel' into catch_tests_ng		2017-03-06 18:34:46 +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	Alphabetically ordered includeds	2017-03-06 16:04:43 +01:00
Cache	Completed implementation of transactional cache.	2017-03-06 10:31:36 -05:00
Cluster	try to fix non-enterprise compile error	2017-03-06 18:09:43 +01:00
GeneralServer	jslint && cppcheck	2017-03-06 16:13:04 +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	Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api	2017-03-06 17:40:46 +01:00
Replication	Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api	2017-02-27 14:38:35 +01:00
Rest	added --console	2016-04-10 13:47:53 +02:00
RestHandler	Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api	2017-03-02 22:20:59 +01:00
RestServer	don't fail when using optional features as dependencies	2017-03-01 12:52:51 +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	added assertion	2017-03-02 13:21:07 +01:00
Transaction	remove dependency on MMFilesLogfileManager	2017-03-01 15:50:10 +01:00
Utils	remove references to MMFiles*	2017-03-06 17:04:23 +01:00
V8Server	Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api	2017-03-02 15:24:17 +01:00
VocBase	Fixed error in recovery for duplicate collection name	2017-03-06 17:34:54 +01:00
CMakeLists.txt	Merge branch 'devel' into catch_tests_ng	2017-03-06 18:34:46 +01:00
dbg.cmake	streamline import process; fix arangoexport	2017-02-20 15:35:34 +01:00