diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-15 00:31:52 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-15 00:31:52 -0700 |
| commit | f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2 (patch) | |
| tree | 42dd270599a9445998b064a942d5092a62f702d7 /project/SparkBuild.scala | |
| parent | 9cafacf32ddb9a3f6c5cb774e4fe527225273f16 (diff) | |
| parent | f9d40a5848a2e1eef31ac63cd9221d5b77c1c5a7 (diff) | |
| download | spark-f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2.tar.gz spark-f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2.tar.bz2 spark-f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2.zip | |
Merge branch 'master' of github.com:mesos/spark into shufflemerge
Conflicts:
core/src/main/scala/spark/storage/BlockManager.scala
core/src/test/scala/spark/DistributedSuite.scala
project/SparkBuild.scala
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 dbfe5b0aa6..234b021c93 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -161,7 +161,8 @@ object SparkBuild extends Build { "cc.spray" % "spray-server" % "1.0-M2.1" excludeAll(excludeNetty), "cc.spray" % "spray-json_2.9.2" % "1.1.1" excludeAll(excludeNetty), "org.apache.mesos" % "mesos" % "0.9.0-incubating", - "io.netty" % "netty-all" % "4.0.0.Beta2" + "io.netty" % "netty-all" % "4.0.0.Beta2", + "org.apache.derby" % "derby" % "10.4.2.0" % "test" ) ++ ( if (HADOOP_MAJOR_VERSION == "2") { if (HADOOP_YARN) { |