Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

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 &&

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;
 

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;