git commit: Upgrade to mesos 0.19.1 and fix broken vagrant provisioner.

[wf...@apache.org]

Repository: incubator-aurora
Updated Branches:
  refs/heads/master 8d985429d -> 6c28e7ee8


Upgrade to mesos 0.19.1 and fix broken vagrant provisioner.

Bugs closed: AURORA-648

Reviewed at https://reviews.apache.org/r/24616/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/6c28e7ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/6c28e7ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/6c28e7ee

Branch: refs/heads/master
Commit: 6c28e7ee86d97737446fce8f75cf2987853a007f
Parents: 8d98542
Author: Bill Farner <wf...@apache.org>
Authored: Tue Aug 12 14:21:52 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Tue Aug 12 14:21:52 2014 -0700

----------------------------------------------------------------------
 3rdparty/python/BUILD                      |  2 +-
 build.gradle                               |  2 +-
 examples/vagrant/provision-dev-cluster.sh  | 10 +++++-----
 examples/vagrant/upstart/mesos-master.conf |  6 +++++-
 4 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6c28e7ee/3rdparty/python/BUILD
----------------------------------------------------------------------
diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD
index e5a859d..edc446e 100644
--- a/3rdparty/python/BUILD
+++ b/3rdparty/python/BUILD
@@ -33,7 +33,7 @@ make_link('argparse', '1.2.1')
 make_link('bottle', '0.11.6')
 make_link('Flask', '0.9')
 make_link('mako', '0.4.0')
-make_link('mesos', '0.19.0')
+make_link('mesos', '0.19.1')
 make_link('mock', '1.0.1')
 make_link('mox', '0.5.3')
 make_link('psutil', '1.1.2')

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6c28e7ee/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9d862fc..66c8205 100644
--- a/build.gradle
+++ b/build.gradle
@@ -167,7 +167,7 @@ dependencies {
   compile 'javax.servlet:servlet-api:2.5'
   compile "log4j:log4j:${log4jRev}"
   compile 'org.antlr:stringtemplate:3.2.1'
-  compile 'org.apache.mesos:mesos:0.19.0'
+  compile 'org.apache.mesos:mesos:0.19.1'
   compile thriftLib
   compile 'org.apache.zookeeper:zookeeper:3.3.4'
   compile 'org.mybatis:mybatis:3.2.7'

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6c28e7ee/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index b4b3c18..2ce74f8 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -30,15 +30,15 @@ update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
 # that want to advertise the hostname to the user, or other components.
 hostname 192.168.33.7
 
-MESOS_VERSION=0.19.0
+MESOS_VERSION=0.19.1
 
 function prepare_extras() {
   pushd aurora
     # Fetch the mesos egg, needed to build python components.
     mkdir -p third_party
     pushd third_party
-      wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_$MESOS_VERSION_amd64.egg \
-        -O mesos-$MESOS_VERSION-py2.7-linux-x86_64.egg
+      wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos-${MESOS_VERSION}-py2.7-linux-x86_64.egg \
+        -O mesos-${MESOS_VERSION}-py2.7-linux-x86_64.egg
     popd
 
     # Install thrift, needed for code generation in the scheduler build.
@@ -58,8 +58,8 @@ function prepare_extras() {
 }
 
 function install_mesos {
-  wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_$MESOS_VERSION_amd64.deb
-  dpkg --install mesos_$MESOS_VERSION_amd64.deb
+  wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_${MESOS_VERSION}-1.0.ubuntu1204_amd64.deb
+  dpkg --install mesos_${MESOS_VERSION}-1.0.ubuntu1204_amd64.deb
 }
 
 function install_cluster_config {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/6c28e7ee/examples/vagrant/upstart/mesos-master.conf
----------------------------------------------------------------------
diff --git a/examples/vagrant/upstart/mesos-master.conf b/examples/vagrant/upstart/mesos-master.conf
index d4cea30..23d457b 100644
--- a/examples/vagrant/upstart/mesos-master.conf
+++ b/examples/vagrant/upstart/mesos-master.conf
@@ -19,4 +19,8 @@ env LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server
 env MY_HOST=192.168.33.7
 env ZK_HOST=192.168.33.7
 
-exec /usr/local/sbin/mesos-master --zk=zk://$ZK_HOST:2181/mesos/master --ip=$MY_HOST
+exec /usr/local/sbin/mesos-master \
+    --zk=zk://$ZK_HOST:2181/mesos/master \
+    --ip=$MY_HOST \
+    --work_dir=/usr/local/aurora/master/db \
+    --quorum=1