mirror of https://gitee.com/bigwinds/arangodb
Conflicts: Makefile.in arangod/Aql/RestAqlHandler.cpp arangod/Aql/grammar.cpp arangod/Cluster/RestShardHandler.cpp lib/GeneralServer/GeneralServer.h lib/GeneralServer/GeneralServerDispatcher.h lib/HttpServer/HttpServerJob.h lib/HttpServer/HttpsCommTask.h lib/SimpleHttpClient/SslClientConnection.cpp |
||
---|---|---|
.. | ||
AgencyComm.cpp | ||
AgencyComm.h | ||
ApplicationCluster.cpp | ||
ApplicationCluster.h | ||
ClusterComm.cpp | ||
ClusterComm.h | ||
ClusterInfo.cpp | ||
ClusterInfo.h | ||
ClusterMethods.cpp | ||
ClusterMethods.h | ||
HeartbeatThread.cpp | ||
HeartbeatThread.h | ||
RestShardHandler.cpp | ||
RestShardHandler.h | ||
ServerJob.cpp | ||
ServerJob.h | ||
ServerState.cpp | ||
ServerState.h | ||
v8-cluster.cpp | ||
v8-cluster.h |