diff options
| author | Andrew Or <andrewor14@gmail.com> | 2014-01-02 20:51:23 -0800 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2014-01-02 20:51:23 -0800 |
| commit | df413e996fb7a4d7e05698e21d130387cf771811 (patch) | |
| tree | dfda1413b1faeff3ba6b929cd0fd3b3d56c907e9 /project/SparkBuild.scala | |
| parent | 8831923219faf1599957056dd5f406a22d1f1128 (diff) | |
| parent | 498a5f0a1c6e82a33c2ad8c48b68bbdb8da57a95 (diff) | |
| download | spark-df413e996fb7a4d7e05698e21d130387cf771811.tar.gz spark-df413e996fb7a4d7e05698e21d130387cf771811.tar.bz2 spark-df413e996fb7a4d7e05698e21d130387cf771811.zip | |
Merge remote-tracking branch 'spark/master'
Conflicts:
core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 7bcbd90bd3..2eef2dfa5e 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"), @@ -247,7 +247,9 @@ object SparkBuild extends Build { "com.codahale.metrics" % "metrics-ganglia" % "3.0.0", "com.codahale.metrics" % "metrics-graphite" % "3.0.0", "com.twitter" %% "chill" % "0.3.1", - "com.twitter" % "chill-java" % "0.3.1" + "com.twitter" % "chill-java" % "0.3.1", + "com.typesafe" % "config" % "1.0.2", + "com.clearspring.analytics" % "stream" % "2.5.1" ) ) |