Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge problems

This commit is contained in:
Oreste Panaia 2012-10-22 21:51:23 +08:00
parent a5796c8c66
commit 56cd3327a6
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/RestServer/ArangoServer.cpp
View File

@ -825,9 +825,6 @@ int ArangoServer::executeConsole (OperationMode::server_operation_mode_e mode) {
}
}
console->close();
delete console;
#endif
break;
}

2
arangosh/Benchmark/arangob.cpp
View File

@ -44,7 +44,7 @@
#include "Logger/Logger.h"
#include "Rest/Endpoint.h"
#include "Rest/HttpRequest.h"
#include "Rest/Initialise.h"
#include "Rest/InitialiseRest.h"
#include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h"
#include "Benchmark/BenchmarkCounter.h"