Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B49710DC3 for ; Thu, 30 Jan 2014 21:40:31 +0000 (UTC) Received: (qmail 8837 invoked by uid 500); 30 Jan 2014 21:40:30 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 8806 invoked by uid 500); 30 Jan 2014 21:40:30 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 8796 invoked by uid 99); 30 Jan 2014 21:40:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 21:40:30 +0000 X-ASF-Spam-Status: No, hits=-2000.5 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 30 Jan 2014 21:40:26 +0000 Received: (qmail 8375 invoked by uid 99); 30 Jan 2014 21:40:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 21:40:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3C425916702; Thu, 30 Jan 2014 21:40:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wickman@apache.org To: commits@aurora.incubator.apache.org Message-Id: <28704d1bd020489a988a3f4f3c985f85@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Upgrade mesos to 0.15.0 Date: Thu, 30 Jan 2014 21:40:04 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Thu Jan 30 13:39:44 2014 -0800 Committer: Brian Wickman 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 < /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'),