aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject aurora git commit: Upgrade mesos dependency to 0.25.0
Date Wed, 23 Dec 2015 21:40:14 GMT
Repository: aurora
Updated Branches:
  refs/heads/master 0d9fe1862 -> 9176b6423


Upgrade mesos dependency to 0.25.0

Bugs closed: AURORA-1565

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


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

Branch: refs/heads/master
Commit: 9176b6423158a7ef98f4f11b0c90955ee808df90
Parents: 0d9fe18
Author: Bill Farner <wfarner@apache.org>
Authored: Wed Dec 23 13:40:05 2015 -0800
Committer: Bill Farner <wfarner@apache.org>
Committed: Wed Dec 23 13:40:05 2015 -0800

----------------------------------------------------------------------
 3rdparty/python/BUILD                                          | 2 +-
 NEWS                                                           | 1 +
 build.gradle                                                   | 2 +-
 docs/deploying-aurora-scheduler.md                             | 2 +-
 examples/vagrant/provision-dev-cluster.sh                      | 6 +++---
 .../org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java | 6 ++++++
 .../java/org/apache/aurora/scheduler/app/local/FakeMaster.java | 5 +++++
 7 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/9176b642/3rdparty/python/BUILD
----------------------------------------------------------------------
diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD
index 4301a83..943ee5d 100644
--- a/3rdparty/python/BUILD
+++ b/3rdparty/python/BUILD
@@ -11,7 +11,7 @@
 # limitations under the License.
 #
 
-MESOS_REV = '0.24.1'
+MESOS_REV = '0.25.0'
 
 python_requirement_library(
   name = 'mesos.interface',

http://git-wip-us.apache.org/repos/asf/aurora/blob/9176b642/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index ebfc3a6..f56f1e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 0.12.0
 ------
 - Removed the deprecated field 'ConfigGroup.instanceIds' from the API.
+- Upgraded Mesos to 0.25.0.
 
 0.11.0
 ------

http://git-wip-us.apache.org/repos/asf/aurora/blob/9176b642/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 3bd4cfd..6d9d2d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -347,7 +347,7 @@ dependencies {
   compile "javax.servlet:javax.servlet-api:${servletRev}"
   compile "log4j:log4j:${log4jRev}"
   compile "org.antlr:stringtemplate:${stringTemplateRev}"
-  compile 'org.apache.mesos:mesos:0.24.1'
+  compile 'org.apache.mesos:mesos:0.25.0'
   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/9176b642/docs/deploying-aurora-scheduler.md
----------------------------------------------------------------------
diff --git a/docs/deploying-aurora-scheduler.md b/docs/deploying-aurora-scheduler.md
index 73b2e04..c0988e8 100644
--- a/docs/deploying-aurora-scheduler.md
+++ b/docs/deploying-aurora-scheduler.md
@@ -39,7 +39,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 8 or higher) and libmesos (0.24.1) installed.
+should have a JVM (Java 8 or higher) and libmesos (0.25.0) 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/9176b642/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index 3615dc5..fc8915f 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.24.1
+readonly MESOS_VERSION=0.25.0
 
 function prepare_extras() {
   pushd aurora
@@ -59,8 +59,8 @@ function prepare_extras() {
 }
 
 function install_mesos {
-  deb=mesos_${MESOS_VERSION}-0.2.35.ubuntu1204_amd64.deb
-  wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/$deb
+  deb=mesos_${MESOS_VERSION}-0.2.70.ubuntu1404_amd64.deb
+  wget -c http://downloads.mesosphere.io/master/ubuntu/14.04/$deb
   dpkg --install $deb
 }
 

http://git-wip-us.apache.org/repos/asf/aurora/blob/9176b642/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
----------------------------------------------------------------------
diff --git a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
index 2b24578..07296e8 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
@@ -16,6 +16,7 @@ package org.apache.aurora.benchmark.fakes;
 import java.util.Collection;
 
 import org.apache.mesos.Protos;
+import org.apache.mesos.Protos.Status;
 import org.apache.mesos.SchedulerDriver;
 
 public class FakeSchedulerDriver implements SchedulerDriver {
@@ -135,4 +136,9 @@ public class FakeSchedulerDriver implements SchedulerDriver {
       Collection<Protos.TaskStatus> statuses) {
     return null;
   }
+
+  @Override
+  public Status suppressOffers() {
+    return null;
+  }
 }

http://git-wip-us.apache.org/repos/asf/aurora/blob/9176b642/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
index e551755..6b1d2b1 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
@@ -304,6 +304,11 @@ public class FakeMaster implements SchedulerDriver, DriverFactory {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public Status suppressOffers() {
+    throw new UnsupportedOperationException();
+  }
+
   private static final class Task {
     private final Offer offer;
     private final TaskInfo taskInfo;


Mime
View raw message