Fix cluster startup.

arangod/RestServer/BootstrapFeature.cpp

@@ -112,7 +112,7 @@ static void raceForClusterBootstrap() {
 
     b.clear();
     b.add(VPackValue("done"));
-    result = agency.setValue("Bootstrap", b.slice(), 15);
+    result = agency.setValue("Bootstrap", b.slice(), 0);
     if (result.successful()) {
       return;
     }

js/server/bootstrap/cluster-bootstrap.js

@@ -0,0 +1,55 @@
+'use strict';
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief run cluster bootstrap
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2016 ArangoDB GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Max Neunhoeffer
+/// @author Copyright 2016, ArangoDB GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief initialize a new database
+////////////////////////////////////////////////////////////////////////////////
+
+(function () {
+  var internal = require("internal");
+  var console = require("console");
+  global.UPGRADE_ARGS = {
+    isCluster: true,
+    isCoordinator: true,
+    isRelaunch: false,
+    upgrade: false
+  };
+  var result = internal.loadStartup("server/upgrade-database.js");
+  result = global.UPGRADE_STARTED && result;
+  delete global.UPGRADE_STARTED;
+  delete global.UPGRADE_ARGS;
+
+  if (!result) {
+    console.error("upgrade-database.js for cluster script failed!");
+  }
+  return true;
+}());
+
+