diff options
| author | Matei Zaharia <matei@databricks.com> | 2013-12-31 18:23:14 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2013-12-31 18:23:14 -0500 |
| commit | ba9338f104ccc71d4f342a3f96624a9b36895f48 (patch) | |
| tree | 5a5b2bf6b34565a594a68fff59b9dd2af234be7f /project/SparkBuild.scala | |
| parent | 0fa5809768cf60ec62b4277f04e23a44dc1582e2 (diff) | |
| parent | 63b411dd8664c27ac55586d8345733afad80961f (diff) | |
| download | spark-ba9338f104ccc71d4f342a3f96624a9b36895f48.tar.gz spark-ba9338f104ccc71d4f342a3f96624a9b36895f48.tar.bz2 spark-ba9338f104ccc71d4f342a3f96624a9b36895f48.zip | |
Merge remote-tracking branch 'apache/master' into conf2
Conflicts:
core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala
streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 37d6f1b60d..204662f74f 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -178,7 +178,7 @@ object SparkBuild extends Build { libraryDependencies ++= Seq( - "io.netty" % "netty-all" % "4.0.0.CR1", + "io.netty" % "netty-all" % "4.0.13.Final", "org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106", /** Workaround for SPARK-959. Dependency used by org.eclipse.jetty. Fixed in ivy 2.3.0. */ "org.eclipse.jetty.orbit" % "javax.servlet" % "2.5.0.v201103041518" artifacts Artifact("javax.servlet", "jar", "jar"), |