diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-03 11:10:00 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-03 11:10:00 -0700 |
| commit | c04aeaf3650317b31d0355ad87b6ad81a2377f1d (patch) | |
| tree | 39a78c11b65ee163b86ff7ad63479cdc71d7902a | |
| parent | 66d848175abf171eec642b5a2f3b671690de9044 (diff) | |
| parent | 589756767972785ee066f109a50ec59af61dadee (diff) | |
| download | spark-c04aeaf3650317b31d0355ad87b6ad81a2377f1d.tar.gz spark-c04aeaf3650317b31d0355ad87b6ad81a2377f1d.tar.bz2 spark-c04aeaf3650317b31d0355ad87b6ad81a2377f1d.zip | |
Merge pull request #243 from andyk/mesos-from-maven-central
Removes the included mesos-0.9.0.jar and pulls it from Maven Central instead
| -rw-r--r-- | core/lib/mesos-0.9.0.jar | bin | 264708 -> 0 bytes | |||
| -rw-r--r-- | project/SparkBuild.scala | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/lib/mesos-0.9.0.jar b/core/lib/mesos-0.9.0.jar Binary files differdeleted file mode 100644 index b7ad79bf2a..0000000000 --- a/core/lib/mesos-0.9.0.jar +++ /dev/null diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d007d8519e..4184008506 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -80,7 +80,8 @@ object SparkBuild extends Build { "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", "cc.spray" % "spray-can" % "1.0-M2.1", - "cc.spray" % "spray-server" % "1.0-M2.1" + "cc.spray" % "spray-server" % "1.0-M2.1", + "org.apache.mesos" % "mesos" % "0.9.0-incubating" ) ) ++ assemblySettings ++ extraAssemblySettings ++ Twirl.settings |