Jan Steemann aadd0f9254 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Utils/CollectionNameResolver.h arangod/V8Server/v8-vocbase.cpp		2014-08-30 17:35:08 +02:00
..
AgencyComm.cpp	…
AgencyComm.h	…
ApplicationCluster.cpp	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
ApplicationCluster.h	…
ClusterComm.cpp	…
ClusterComm.h	…
ClusterInfo.cpp	Sort out TRI_CompareValuesJson to use UTF8 on demand.	2014-08-13 14:22:05 +02:00
ClusterInfo.h	Implement distributeShardsLike	2014-08-01 17:05:04 +02:00
ClusterMethods.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-30 17:35:08 +02:00
ClusterMethods.h	added `type` option for `GET /_api/document?collection=...`	2014-08-30 17:26:24 +02:00
HeartbeatThread.cpp	towards new dispatcher interface	2014-08-18 23:37:32 +02:00
HeartbeatThread.h	…
RestShardHandler.cpp	…
RestShardHandler.h	…
ServerJob.cpp	towards new dispatcher interface	2014-08-18 23:37:32 +02:00
ServerJob.h	…
ServerState.cpp	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
ServerState.h	…
v8-cluster.cpp	Return headers and body in ArangoClusterComm.syncRequest method.	2014-08-25 16:35:02 +02:00
v8-cluster.h	…