From 20479ef320f7dcc7fef0534b251bedb284509275 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Fri, 9 May 2014 11:00:18 +0200 Subject: [PATCH 1/2] added missing namespace --- lib/Scheduler/Scheduler.cpp | 1 + lib/Scheduler/TimerTask.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/Scheduler/Scheduler.cpp b/lib/Scheduler/Scheduler.cpp index 2476a181af..6528175d3b 100644 --- a/lib/Scheduler/Scheduler.cpp +++ b/lib/Scheduler/Scheduler.cpp @@ -39,6 +39,7 @@ #include "Scheduler/SchedulerThread.h" #include "Scheduler/Task.h" +using namespace std; using namespace triagens::basics; using namespace triagens::rest; diff --git a/lib/Scheduler/TimerTask.cpp b/lib/Scheduler/TimerTask.cpp index 1e17d2189b..d15dff5310 100644 --- a/lib/Scheduler/TimerTask.cpp +++ b/lib/Scheduler/TimerTask.cpp @@ -31,6 +31,7 @@ #include "BasicsC/logging.h" #include "Scheduler/Scheduler.h" +using namespace std; using namespace triagens::basics; using namespace triagens::rest; From 21b0264e01348a3b1b3acde72e44864899eed456 Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Fri, 9 May 2014 11:48:06 +0200 Subject: [PATCH 2/2] Sort out SSL in PortFinder. --- js/server/modules/org/arangodb/cluster/planner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/server/modules/org/arangodb/cluster/planner.js b/js/server/modules/org/arangodb/cluster/planner.js index 1e03999362..bcd7c788bf 100644 --- a/js/server/modules/org/arangodb/cluster/planner.js +++ b/js/server/modules/org/arangodb/cluster/planner.js @@ -135,7 +135,7 @@ PortFinder.prototype.next = function () { available = testPort("tcp://0.0.0.0:"+this.port); } else { - var url = "http" + this.dispatcher.endpoint.substr(3) + + var url = endpointToURL(this.dispatcher.endpoint) + "/_admin/clusterCheckPort?port="+this.port; var hdrs = {}; if (this.dispatcher.username !== undefined &&