diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-05-15 18:06:24 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-05-15 18:06:24 -0700 |
| commit | 2f576aba8f6a7a101d2862808d03ec0da5ad00d4 (patch) | |
| tree | 2c17071022e4051c803fae945cf868e11a15d454 /project/SparkBuild.scala | |
| parent | 48c6f46a6f0257bcf5e9d7f9a0e0b5b29d5815f9 (diff) | |
| parent | f3491cb89bcbd8748bedbd2fe6a200ba09d9e3c2 (diff) | |
| download | spark-2f576aba8f6a7a101d2862808d03ec0da5ad00d4.tar.gz spark-2f576aba8f6a7a101d2862808d03ec0da5ad00d4.tar.bz2 spark-2f576aba8f6a7a101d2862808d03ec0da5ad00d4.zip | |
Merge pull request #602 from rxin/shufflemerge
Manual merge & cleanup of Shane's Shuffle Performance Optimization
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 267008bfa4..234b021c93 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -161,6 +161,7 @@ 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", "org.apache.derby" % "derby" % "10.4.2.0" % "test" ) ++ ( if (HADOOP_MAJOR_VERSION == "2") { |