You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/08/09 01:18:06 UTC
git commit: Upgrading Mesos version from 0.18.0 to 0.19.0
Repository: incubator-aurora
Updated Branches:
refs/heads/master 63792c44e -> 842f478bb
Upgrading Mesos version from 0.18.0 to 0.19.0
Bugs closed: AURORA-579
Reviewed at https://reviews.apache.org/r/23348/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/842f478b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/842f478b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/842f478b
Branch: refs/heads/master
Commit: 842f478bbbb2ae89a3f85cf85ce8c468d16709f7
Parents: 63792c4
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Fri Aug 8 15:44:08 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Fri Aug 8 15:44:08 2014 -0700
----------------------------------------------------------------------
3rdparty/python/BUILD | 2 +-
build.gradle | 2 +-
examples/scheduler/scheduler-local.sh | 2 +-
examples/vagrant/provision-dev-cluster.sh | 10 ++++++----
4 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/842f478b/3rdparty/python/BUILD
----------------------------------------------------------------------
diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD
index 641d610..e5a859d 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.18.0')
+make_link('mesos', '0.19.0')
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/842f478b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2756e84..9d862fc 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.18.0'
+ compile 'org.apache.mesos:mesos:0.19.0'
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/842f478b/examples/scheduler/scheduler-local.sh
----------------------------------------------------------------------
diff --git a/examples/scheduler/scheduler-local.sh b/examples/scheduler/scheduler-local.sh
index 7df66f6..6253d50 100755
--- a/examples/scheduler/scheduler-local.sh
+++ b/examples/scheduler/scheduler-local.sh
@@ -25,7 +25,7 @@ JAVA_OPTS=(
-Xmx2g
-Xms2g
- # Location of libmesos-0.18.0.so / libmesos-0.18.0.dylib
+ # Location of libmesos-XXXX.so / libmesos-XXXX.dylib
-Djava.library.path=/usr/local/lib
)
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/842f478b/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index 5b2d544..b4b3c18 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -30,13 +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
+
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_0.18.0_amd64.egg \
- -O mesos-0.18.0-py2.7-linux-x86_64.egg
+ 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
popd
# Install thrift, needed for code generation in the scheduler build.
@@ -56,8 +58,8 @@ function prepare_extras() {
}
function install_mesos {
- wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.18.0_amd64.deb
- dpkg --install mesos_0.18.0_amd64.deb
+ wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_$MESOS_VERSION_amd64.deb
+ dpkg --install mesos_$MESOS_VERSION_amd64.deb
}
function install_cluster_config {