Simon Grätzer 4fe234803e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel		2016-12-09 17:37:51 +01:00
..
Actions	do not url-decode paths eagerly	2016-11-15 15:46:21 +01:00
Agency	fix memleak	2016-12-09 17:17:20 +01:00
Aql	Readd satellite node	2016-12-09 15:30:03 +01:00
Cluster	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 17:37:51 +01:00
FulltextIndex	Squashed commit of the following:	2016-10-24 10:18:30 +02:00
GeneralServer	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 17:37:51 +01:00
GeoIndex	Squashed commit of the following:	2016-10-24 10:18:30 +02:00
Indexes	added specialized fasthash version for uint64 input	2016-12-08 13:32:48 +01:00
InternalRestHandler	do not url-decode paths eagerly	2016-11-15 15:46:21 +01:00
Pregel	Fixing errors	2016-12-09 17:37:11 +01:00
Replication	Improve error messages	2016-11-21 17:47:05 +01:00
Rest	…
RestHandler	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 14:30:19 +01:00
RestServer	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-01 14:11:14 +01:00
Scheduler	removed left-over merge conflict	2016-12-05 16:36:27 +01:00
Statistics	fix indentation	2016-11-25 15:12:15 +01:00
StorageEngine	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-11-29 10:59:45 +01:00
Utils	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 14:30:19 +01:00
V8Server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 14:30:19 +01:00
VocBase	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 14:30:19 +01:00
Wal	handle OOM a bit more gracefully	2016-11-28 14:22:12 +01:00
CMakeLists.txt	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-12-09 17:37:51 +01:00