You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wi...@apache.org on 2014/01/30 22:40:04 UTC
git commit: Upgrade mesos to 0.15.0
Updated Branches:
refs/heads/master 2e89d69bb -> b86b2fed0
Upgrade mesos to 0.15.0
Upgrade mesos dependency to 0.15.0
Testing Done:
vagrant up
./build-support/jenkins/build.sh
Bugs closed: AURORA-115
Reviewed at https://reviews.apache.org/r/17475/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/b86b2fed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/b86b2fed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/b86b2fed
Branch: refs/heads/master
Commit: b86b2fed07c92e773ce1979da4c4c6eb9af7a824
Parents: 2e89d69
Author: Kevin Sweeney <ke...@apache.org>
Authored: Thu Jan 30 13:39:44 2014 -0800
Committer: Brian Wickman <wi...@apache.org>
Committed: Thu Jan 30 13:39:44 2014 -0800
----------------------------------------------------------------------
3rdparty/python/BUILD | 2 +-
build.gradle | 2 +-
examples/vagrant/provision-aurora-scheduler.sh | 4 ++--
examples/vagrant/provision-dev-environment.sh | 4 ++--
examples/vagrant/provision-mesos-master.sh | 4 ++--
examples/vagrant/provision-mesos-slave.sh | 4 ++--
src/main/python/apache/aurora/executor/BUILD | 6 +++---
7 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b86b2fed/3rdparty/python/BUILD
----------------------------------------------------------------------
diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD
index 735a063..cc3e8c9 100644
--- a/3rdparty/python/BUILD
+++ b/3rdparty/python/BUILD
@@ -18,7 +18,7 @@ python_requirement('argparse==1.2.1')
python_requirement('bottle==0.11.6')
python_requirement('cherrypy==3.2.2')
python_requirement('mako==0.4.0')
-python_requirement('mesos-core==0.15.0-rc4')
+python_requirement('mesos==0.15.0')
python_requirement('mock==1.0.1')
python_requirement('mox==0.5.3')
python_requirement('psutil==1.1.2')
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b86b2fed/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4660a2c..2f355d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -145,7 +145,7 @@ dependencies {
compile 'javax.servlet:servlet-api:2.5'
compile 'log4j:log4j:1.2.17'
compile 'org.antlr:stringtemplate:3.2.1'
- compile 'org.apache.mesos:mesos:0.15.0-rc3'
+ compile 'org.apache.mesos:mesos:0.15.0'
def thriftLib = 'org.apache.thrift:libthrift:0.9.1'
compile thriftLib
compile 'org.apache.zookeeper:zookeeper:3.3.4'
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b86b2fed/examples/vagrant/provision-aurora-scheduler.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-aurora-scheduler.sh b/examples/vagrant/provision-aurora-scheduler.sh
index f96c2e7..e48291a 100755
--- a/examples/vagrant/provision-aurora-scheduler.sh
+++ b/examples/vagrant/provision-aurora-scheduler.sh
@@ -8,8 +8,8 @@ install -m 755 /vagrant/dist/aurora_admin.pex /usr/local/bin/aurora_admin
apt-get update
apt-get -y install java7-runtime-headless curl
-wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.deb
-dpkg --install mesos_0.15.0-rc4_amd64.deb
+wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0_amd64.deb
+dpkg --install mesos_0.15.0_amd64.deb
# TODO(ksweeney): Make this a be part of the Aurora distribution tarball.
# Location where aurora-scheduler.zip was unpacked.
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b86b2fed/examples/vagrant/provision-dev-environment.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-environment.sh b/examples/vagrant/provision-dev-environment.sh
index d8cc1fe..7fc11bf 100755
--- a/examples/vagrant/provision-dev-environment.sh
+++ b/examples/vagrant/provision-dev-environment.sh
@@ -13,8 +13,8 @@ pushd aurora
AURORA_VERSION=$(cat .auroraversion | tr '[a-z]' '[A-Z]')
mkdir -p third_party
pushd third_party
- wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.egg \
- -O mesos-0.15.0_rc4-py2.7-linux-x86_64.egg
+ wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0_amd64.egg \
+ -O mesos-0.15.0-py2.7-linux-x86_64.egg
popd
git pull
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b86b2fed/examples/vagrant/provision-mesos-master.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-mesos-master.sh b/examples/vagrant/provision-mesos-master.sh
index 0420629..6e8a923 100755
--- a/examples/vagrant/provision-mesos-master.sh
+++ b/examples/vagrant/provision-mesos-master.sh
@@ -1,8 +1,8 @@
#!/bin/bash -x
apt-get update
apt-get -y install java7-runtime-headless curl
-wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.deb
-dpkg --install mesos_0.15.0-rc4_amd64.deb
+wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0_amd64.deb
+dpkg --install mesos_0.15.0_amd64.deb
cat > /usr/local/sbin/mesos-master.sh <<EOF
#!/bin/bash
export LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b86b2fed/examples/vagrant/provision-mesos-slave.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-mesos-slave.sh b/examples/vagrant/provision-mesos-slave.sh
index 5170b40..c2548a2 100755
--- a/examples/vagrant/provision-mesos-slave.sh
+++ b/examples/vagrant/provision-mesos-slave.sh
@@ -1,8 +1,8 @@
#!/bin/bash -x
apt-get update
apt-get -y install java7-runtime-headless curl
-wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.deb
-dpkg --install mesos_0.15.0-rc4_amd64.deb
+wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0_amd64.deb
+dpkg --install mesos_0.15.0_amd64.deb
cat > /usr/local/sbin/mesos-slave.sh <<"EOF"
#!/bin/bash
export LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/b86b2fed/src/main/python/apache/aurora/executor/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/executor/BUILD b/src/main/python/apache/aurora/executor/BUILD
index 2524b2e..667975b 100644
--- a/src/main/python/apache/aurora/executor/BUILD
+++ b/src/main/python/apache/aurora/executor/BUILD
@@ -70,7 +70,7 @@ python_library(
name = 'thermos_executor_base',
sources = ['executor_base.py'],
dependencies = [
- pants('3rdparty/python:mesos-core'),
+ pants('3rdparty/python:mesos'),
pants('3rdparty/python:twitter.common.log'),
pants('src/main/thrift/org/apache/thermos:py-thrift'),
pants('src/main/thrift/org/apache/aurora/gen:py-thrift'),
@@ -83,7 +83,7 @@ python_library(
dependencies = [
pants(':status_manager'),
pants(':thermos_executor_base'),
- pants('3rdparty/python:mesos-core'),
+ pants('3rdparty/python:mesos'),
pants('3rdparty/python:pystachio'),
pants('3rdparty/python:twitter.common.app'),
pants('3rdparty/python:twitter.common.concurrent'),
@@ -114,7 +114,7 @@ python_library(
dependencies = [
pants(':executor_detector'),
pants(':thermos_executor_base'),
- pants('3rdparty/python:mesos-core'),
+ pants('3rdparty/python:mesos'),
pants('3rdparty/python:psutil'),
pants('3rdparty/python:twitter.common.collections'),
pants('3rdparty/python:twitter.common.exceptions'),