Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH ... Conflicts: arangod/Cluster/HeartbeatThread.cpp arangod/RestServer/RestServerFeature.cpp		2016-06-01 16:25:13 +02:00
..
GeneralRequest.cpp	added fillBody	2016-05-13 15:14:44 +02:00
GeneralRequest.h	added fillBody	2016-05-13 15:14:44 +02:00
GeneralResponse.cpp	…
GeneralResponse.h	added fillBody	2016-05-13 15:14:44 +02:00
HttpRequest.cpp	added fillBody	2016-05-13 15:14:44 +02:00
HttpRequest.h	…
HttpResponse.cpp	Fix a crash in RestShardHandler.	2016-05-19 16:47:53 +02:00
HttpResponse.h	added fillBody	2016-05-13 15:14:44 +02:00
InitializeRest.cpp	…
InitializeRest.h	…
RequestContext.h	WIP	2016-06-01 13:37:13 +02:00
Version.cpp	added RocksDB version information, fixed comparator	2016-05-27 12:58:26 +02:00
Version.h	…