| diff --git a/ivy/libraries.properties b/ivy/libraries.properties |
| index 0b3c715..6b7770b 100644 |
| --- a/ivy/libraries.properties |
| +++ b/ivy/libraries.properties |
| @@ -75,3 +75,5 @@ slf4j-log4j12.version=1.4.3 |
| wagon-http.version=1.0-beta-2 |
| xmlenc.version=0.52 |
| xerces.version=1.4.4 |
| + |
| +protobuf-java.version=2.4.1 |
| diff --git a/src/contrib/build.xml b/src/contrib/build.xml |
| index e41c132..593aecd 100644 |
| --- a/src/contrib/build.xml |
| +++ b/src/contrib/build.xml |
| @@ -57,6 +57,7 @@ |
| <fileset dir="." includes="capacity-scheduler/build.xml"/> |
| <fileset dir="." includes="mrunit/build.xml"/> |
| <fileset dir="." includes="gridmix/build.xml"/> |
| + <fileset dir="." includes="mesos/build.xml"/> |
| </subant> |
| <available file="${build.contrib.dir}/testsfailed" property="testsfailed"/> |
| <fail if="testsfailed">Tests failed!</fail> |
| diff --git a/src/contrib/mesos/src/java/org/apache/hadoop/mapred/MesosScheduler.java b/src/contrib/mesos/src/java/org/apache/hadoop/mapred/MesosScheduler.java |
| index 545c3c7..f6950be 100644 |
| --- a/src/contrib/mesos/src/java/org/apache/hadoop/mapred/MesosScheduler.java |
| +++ b/src/contrib/mesos/src/java/org/apache/hadoop/mapred/MesosScheduler.java |
| @@ -257,6 +257,11 @@ public class MesosScheduler extends TaskScheduler implements Scheduler { |
| taskScheduler.refresh(); |
| } |
| |
| + @Override |
| + public synchronized void checkJobSubmission(JobInProgress job) throws IOException { |
| + taskScheduler.checkJobSubmission(job); |
| + } |
| + |
| // Mesos Scheduler methods. |
| @Override |
| public synchronized void registered( |