Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes

js/apps/system/aardvark/clusterFrontend/js/views/planSymmetricView.js

@@ -157,6 +157,11 @@
           var host = dispatcher.endpoint;
           host = host.split("//")[1];
           host = host.split(":");
+
+          if (host === 'localhost') {
+            host = '127.0.0.1';
+          }
+
           var user = dispatcher.username;
           var passwd = dispatcher.passwd;
           var template = self.entryTemplate.render({

js/apps/system/aardvark/clusterFrontend/js/views/planTestView.js

@@ -80,12 +80,22 @@
         var host = config.dispatchers.d1.endpoint;
         host = host.split("://")[1];
         host = host.split(":");
+
+        if (host === 'localhost') {
+          host = '127.0.0.1'
+        }
+
         param.hostname = host[0];
         param.port = host[1];
       } else {
         param.dbs = 3;
         param.coords = 2;
         param.hostname = window.location.hostname;
+
+        if (param.hostname === 'localhost') {
+          param.hostname = '127.0.0.1'
+        }
+
         param.port = window.location.port;
       }
       $(this.el).html(this.template.render(param));

js/server/tests/shell-cluster-agency.js

@@ -1,5 +1,5 @@
 /*jshint strict: true */
-/*global require, fail, assertFalse, assertTrue, assertEqual, assertNotEqual, assertMatch, ArangoAgency */
+/*global require, fail, assertFalse, assertTrue, assertEqual, assertNotEqual, ArangoAgency */
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test the agency communication layer
@@ -82,7 +82,8 @@ function AgencySuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     testVersion : function () {
-      assertMatch(/^etcd/, agency.version());
+      var agencyVersion = JSON.parse(agency.version());
+      assertEqual(agencyVersion.internalVersion, "2");
     },
 
 ////////////////////////////////////////////////////////////////////////////////