mirror of https://gitee.com/bigwinds/arangodb
ffbc45d2e2
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 |
||
|---|---|---|
| .. | ||
| ClientConnection.cpp | ||
| ClientConnection.h | ||
| ConnectionManager.cpp | ||
| ConnectionManager.h | ||
| GeneralClientConnection.cpp | ||
| GeneralClientConnection.h | ||
| SimpleHttpClient.cpp | ||
| SimpleHttpClient.h | ||
| SimpleHttpResult.cpp | ||
| SimpleHttpResult.h | ||
| SslClientConnection.cpp | ||
| SslClientConnection.h | ||