Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream ... * origin/obi-velocystream-frank: fixed ownership of handler Conflicts: arangod/GeneralServer/VppCommTask.cpp		2016-08-19 09:58:27 +02:00
..
Actions	fixed ownership of handler	2016-08-18 23:06:36 +02:00
Agency	Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream	2016-08-11 12:41:08 +02:00
Aql	Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache	2016-08-15 18:58:43 +02:00
Cluster	fixed ownership of handler	2016-08-18 23:06:36 +02:00
Dispatcher	…
FulltextIndex	…
GeneralServer	Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream	2016-08-19 09:58:27 +02:00
GeoIndex	…
Indexes	privatize vocbase methods	2016-08-02 13:49:22 +02:00
ReadCache	remove unused private members	2016-08-16 11:23:06 +02:00
Replication	privatization	2016-08-04 17:06:51 +02:00
Rest	…
RestHandler	Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream	2016-08-19 09:58:27 +02:00
RestServer	fixed ownership of handler	2016-08-18 23:06:36 +02:00
Scheduler	fixed ownership of handler	2016-08-18 23:06:36 +02:00
Statistics	fixed ownership of handler	2016-08-18 23:06:36 +02:00
StorageEngine	move CleanupThread into engine	2016-08-17 10:48:17 +02:00
Utils	Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream	2016-08-19 09:58:27 +02:00
V8Server	Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-test	2016-08-17 13:25:37 +02:00
VocBase	move CleanupThread into engine	2016-08-17 10:48:17 +02:00
Wal	changed index detection	2016-08-16 15:55:10 +02:00
CMakeLists.txt	Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream	2016-08-19 09:58:27 +02:00