diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-07 15:56:19 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-07 15:56:19 -0700 |
| commit | 90577ada691f43be875c9d2ff4aaef962727f34d (patch) | |
| tree | 7cd6238e22bcd87f118368ef21bccdce246496a9 /project | |
| parent | aacca1b8a85bd073ce185a06d6470b070761b2f4 (diff) | |
| parent | b493f55a4fe43c83061a361eef029edbac50c006 (diff) | |
| download | spark-90577ada691f43be875c9d2ff4aaef962727f34d.tar.gz spark-90577ada691f43be875c9d2ff4aaef962727f34d.tar.bz2 spark-90577ada691f43be875c9d2ff4aaef962727f34d.zip | |
Merge branch 'shuffle-performance-fix-0.7' of github.com:shane-huang/spark into shufflemerge
Conflicts:
core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/DiskStore.scala
project/SparkBuild.scala
Diffstat (limited to 'project')
| -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 190d723435..dbfe5b0aa6 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -160,7 +160,8 @@ object SparkBuild extends Build { "cc.spray" % "spray-can" % "1.0-M2.1" excludeAll(excludeNetty), "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" + "org.apache.mesos" % "mesos" % "0.9.0-incubating", + "io.netty" % "netty-all" % "4.0.0.Beta2" ) ++ ( if (HADOOP_MAJOR_VERSION == "2") { if (HADOOP_YARN) { |