diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-11-12 19:13:39 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-11-12 19:13:39 -0800 |
| commit | f49ea28d25728e19e56b140a2f374631c94153bc (patch) | |
| tree | aa1782c6c4b643e87b1bafec247edc956702031e /project/SparkBuild.scala | |
| parent | 87f2f4e5c2812351cdd1b2e35e2b12f62eeb3fdc (diff) | |
| parent | 17bb9a27b2611c9e1f3b10487570484ef3ba8017 (diff) | |
| download | spark-f49ea28d25728e19e56b140a2f374631c94153bc.tar.gz spark-f49ea28d25728e19e56b140a2f374631c94153bc.tar.bz2 spark-f49ea28d25728e19e56b140a2f374631c94153bc.zip | |
Merge pull request #137 from tgravescs/sparkYarnJarsHdfsRebase
Allow spark on yarn to be run from HDFS.
Allows the spark.jar, app.jar, and log4j.properties to be put into hdfs. Allows you to specify the files on a different hdfs cluster and it will copy them over. It makes sure permissions are correct and makes sure to put things into public distributed cache so they can be reused amongst users if their permissions are appropriate. Also add a bit of error handling for missing arguments.
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 115570dbe2..96232718f8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -170,7 +170,8 @@ object SparkBuild extends Build { "org.scalatest" %% "scalatest" % "1.9.1" % "test", "org.scalacheck" %% "scalacheck" % "1.10.0" % "test", "com.novocode" % "junit-interface" % "0.9" % "test", - "org.easymock" % "easymock" % "3.1" % "test" + "org.easymock" % "easymock" % "3.1" % "test", + "org.mockito" % "mockito-all" % "1.8.5" % "test" ), /* Workaround for issue #206 (fixed after SBT 0.11.0) */ watchTransitiveSources <<= Defaults.inDependencies[Task[Seq[File]]](watchSources.task, |