Repository: aurora Updated Branches: refs/heads/master ac8562489 -> 8ba1b114d
Updated mesos library to 0.22.0. Bugs closed: AURORA-1276 Reviewed at https://reviews.apache.org/r/33233/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/8ba1b114 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/8ba1b114 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/8ba1b114 Branch: refs/heads/master Commit: 8ba1b114df00f04c2cce5fbf68be7a5897537c1e Parents: ac85624 Author: Ben Mahler <[email protected]> Authored: Tue Apr 21 15:50:37 2015 -0700 Committer: Maxim Khutornenko <[email protected]> Committed: Tue Apr 21 15:50:37 2015 -0700 ---------------------------------------------------------------------- 3rdparty/python/requirements.txt | 4 ++-- build.gradle | 2 +- docs/deploying-aurora-scheduler.md | 2 +- examples/vagrant/provision-dev-cluster.sh | 2 +- .../java/org/apache/aurora/scheduler/app/local/FakeMaster.java | 6 ++++++ 5 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/8ba1b114/3rdparty/python/requirements.txt ---------------------------------------------------------------------- diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt index 1410daf..439554d 100644 --- a/3rdparty/python/requirements.txt +++ b/3rdparty/python/requirements.txt @@ -1,8 +1,8 @@ bottle==0.11.6 CherryPy==3.6.0 mako==0.4.0 -mesos.interface==0.21.1 -mesos.native==0.21.1 +mesos.interface==0.22.0 +mesos.native==0.22.0 mock==1.0.1 mox==0.5.3 pex==0.8.2 http://git-wip-us.apache.org/repos/asf/aurora/blob/8ba1b114/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index d310e82..470d11e 100644 --- a/build.gradle +++ b/build.gradle @@ -267,7 +267,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.21.1' + compile 'org.apache.mesos:mesos:0.22.0' compile("org.apache.shiro:shiro-guice:${shiroRev}") { // TODO(ksweeney): Remove this exclusion when https://issues.apache.org/jira/browse/SHIRO-496 is resolved. exclude group: 'com.google.guava' http://git-wip-us.apache.org/repos/asf/aurora/blob/8ba1b114/docs/deploying-aurora-scheduler.md ---------------------------------------------------------------------- diff --git a/docs/deploying-aurora-scheduler.md b/docs/deploying-aurora-scheduler.md index 796d821..70d6e3d 100644 --- a/docs/deploying-aurora-scheduler.md +++ b/docs/deploying-aurora-scheduler.md @@ -34,7 +34,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.21.1) installed. +should have a JVM (Java 7 or higher) and libmesos (0.22.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/8ba1b114/examples/vagrant/provision-dev-cluster.sh ---------------------------------------------------------------------- diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh index 73cd7d7..e7fdd4b 100755 --- a/examples/vagrant/provision-dev-cluster.sh +++ b/examples/vagrant/provision-dev-cluster.sh @@ -38,7 +38,7 @@ readonly IP_ADDRESS=192.168.33.7 # that want to advertise the hostname to the user, or other components. hostname $IP_ADDRESS -readonly MESOS_VERSION=0.21.1 +readonly MESOS_VERSION=0.22.0 function prepare_extras() { pushd aurora http://git-wip-us.apache.org/repos/asf/aurora/blob/8ba1b114/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 f4214fb..1a0f14c 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 @@ -294,6 +294,12 @@ public class FakeMaster implements SchedulerDriver, DriverFactory { } @Override + public Status acknowledgeStatusUpdate(TaskStatus status) { + assertNotStopped(); + throw new UnsupportedOperationException(); + } + + @Override public Status sendFrameworkMessage(ExecutorID executorId, SlaveID slaveId, byte[] data) { throw new UnsupportedOperationException(); }
