diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-09-15 13:20:41 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-09-15 13:20:41 -0700 |
| commit | dbd2c4fd948e09a1a270b576ad745d1065006acc (patch) | |
| tree | 868328fbac4c29141a6aac5ba71c8e96e8e711fc | |
| parent | 9fb0b9d77fd383ad2cdd600edcc77c7b43c5e1c2 (diff) | |
| parent | c856860c5b4b0e3ef6f8e23d72d1d0069e3a56bf (diff) | |
| download | spark-dbd2c4fd948e09a1a270b576ad745d1065006acc.tar.gz spark-dbd2c4fd948e09a1a270b576ad745d1065006acc.tar.bz2 spark-dbd2c4fd948e09a1a270b576ad745d1065006acc.zip | |
Merge pull request #932 from pwendell/mesos-version
Bumping Mesos version to 0.13.0
| -rw-r--r-- | docs/_config.yml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/_config.yml b/docs/_config.yml index 5c135a0242..b061764b36 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -6,5 +6,5 @@ markdown: kramdown SPARK_VERSION: 0.8.0-SNAPSHOT SPARK_VERSION_SHORT: 0.8.0 SCALA_VERSION: 2.9.3 -MESOS_VERSION: 0.9.0-incubating +MESOS_VERSION: 0.13.0 SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net @@ -77,7 +77,7 @@ <java.version>1.5</java.version> <scala.version>2.9.3</scala.version> - <mesos.version>0.12.1</mesos.version> + <mesos.version>0.13.0</mesos.version> <akka.version>2.0.5</akka.version> <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 77e211ce03..ed7671757b 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -204,7 +204,7 @@ object SparkBuild extends Build { "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", "net.liftweb" % "lift-json_2.9.2" % "2.5", - "org.apache.mesos" % "mesos" % "0.12.1", + "org.apache.mesos" % "mesos" % "0.13.0", "io.netty" % "netty-all" % "4.0.0.Beta2", "org.apache.derby" % "derby" % "10.4.2.0" % "test", "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), |