Repository: aurora Updated Branches: refs/heads/master 7d2f756e8 -> f91ecd107
Upgrade mesos dependency to 0.24.1. Bugs closed: AURORA-1543 Reviewed at https://reviews.apache.org/r/41315/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/f91ecd10 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/f91ecd10 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/f91ecd10 Branch: refs/heads/master Commit: f91ecd107967c2f5cb56562db746259919a15778 Parents: 7d2f756 Author: Bill Farner <[email protected]> Authored: Mon Dec 14 14:02:07 2015 -0800 Committer: Bill Farner <[email protected]> Committed: Mon Dec 14 14:02:07 2015 -0800 ---------------------------------------------------------------------- 3rdparty/python/BUILD | 2 +- NEWS | 4 ++++ build-support/python/make-mesos-native-egg | 4 ++-- build.gradle | 2 +- docs/deploying-aurora-scheduler.md | 2 +- examples/vagrant/provision-dev-cluster.sh | 7 ++++--- 6 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/f91ecd10/3rdparty/python/BUILD ---------------------------------------------------------------------- diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD index 1a80d66..4301a83 100644 --- a/3rdparty/python/BUILD +++ b/3rdparty/python/BUILD @@ -11,7 +11,7 @@ # limitations under the License. # -MESOS_REV = '0.23.0' +MESOS_REV = '0.24.1' python_requirement_library( name = 'mesos.interface', http://git-wip-us.apache.org/repos/asf/aurora/blob/f91ecd10/NEWS ---------------------------------------------------------------------- diff --git a/NEWS b/NEWS index 6e158d0..99531a3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +0.11.0 +------ +- Upgraded Mesos to 0.24.1. + 0.10.0 ------ - The Python build layout has changed: http://git-wip-us.apache.org/repos/asf/aurora/blob/f91ecd10/build-support/python/make-mesos-native-egg ---------------------------------------------------------------------- diff --git a/build-support/python/make-mesos-native-egg b/build-support/python/make-mesos-native-egg index 47438c5..736685f 100755 --- a/build-support/python/make-mesos-native-egg +++ b/build-support/python/make-mesos-native-egg @@ -107,7 +107,7 @@ build_centos6() { mkdir -pv centos6 pushd centos6 VAGRANTDIR=$PWD - init_vagrant_box chef/centos-6.5 + init_vagrant_box bento/centos-6.7 vagrant up vagrant ssh <<EOF set -e -u @@ -146,7 +146,7 @@ build_centos7() { local python_outdir=$output_basedir/centos/7/python mkdir -pv "$python_outdir" pushd $TMPDIR - init_vagrant_box chef/centos-7.0 + init_vagrant_box bento/centos-7.1 vagrant up vagrant ssh <<EOF set -e -u http://git-wip-us.apache.org/repos/asf/aurora/blob/f91ecd10/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index aeefc57..cb3c45b 100644 --- a/build.gradle +++ b/build.gradle @@ -352,7 +352,7 @@ dependencies { compile "javax.servlet:servlet-api:${servletRev}" compile "log4j:log4j:${log4jRev}" compile "org.antlr:stringtemplate:${stringTemplateRev}" - compile 'org.apache.mesos:mesos:0.23.0' + compile 'org.apache.mesos:mesos:0.24.1' compile "org.apache.shiro:shiro-guice:${shiroRev}" compile "org.apache.shiro:shiro-web:${shiroRev}" compile "org.apache.zookeeper:zookeeper:${zookeeperRev}" http://git-wip-us.apache.org/repos/asf/aurora/blob/f91ecd10/docs/deploying-aurora-scheduler.md ---------------------------------------------------------------------- diff --git a/docs/deploying-aurora-scheduler.md b/docs/deploying-aurora-scheduler.md index 812beaf..29fafca 100644 --- a/docs/deploying-aurora-scheduler.md +++ b/docs/deploying-aurora-scheduler.md @@ -38,7 +38,7 @@ machines. This guide helps you get the scheduler set up and troubleshoot some c ## Installing Aurora The Aurora scheduler is a standalone Java server. As part of the build process it creates a bundle of all its dependencies, with the notable exceptions of the JVM and libmesos. Each target server -should have a JVM (Java 7 or higher) and libmesos (0.23.0) installed. +should have a JVM (Java 8 or higher) and libmesos (0.24.1) installed. ### Creating the Distribution .zip File (Optional) To create a distribution for installation you will need build tools installed. On Ubuntu this can be http://git-wip-us.apache.org/repos/asf/aurora/blob/f91ecd10/examples/vagrant/provision-dev-cluster.sh ---------------------------------------------------------------------- diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh index 3e4bf32..3615dc5 100755 --- a/examples/vagrant/provision-dev-cluster.sh +++ b/examples/vagrant/provision-dev-cluster.sh @@ -34,7 +34,7 @@ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java readonly IP_ADDRESS=192.168.33.7 -readonly MESOS_VERSION=0.23.0 +readonly MESOS_VERSION=0.24.1 function prepare_extras() { pushd aurora @@ -59,8 +59,9 @@ function prepare_extras() { } function install_mesos { - 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 + deb=mesos_${MESOS_VERSION}-0.2.35.ubuntu1204_amd64.deb + wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/$deb + dpkg --install $deb } function install_cluster_config {
