diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-11-25 18:10:54 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-11-25 18:10:54 +0530 |
| commit | 44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd (patch) | |
| tree | cd670cf460d106b5c5241d26aee4b35ccb6242aa /project/SparkBuild.scala | |
| parent | 489862a65766d30278c186d280c6286937c81155 (diff) | |
| parent | 62889c419cfddb1cea2d260e9b530349d9f8eeda (diff) | |
| download | spark-44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd.tar.gz spark-44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd.tar.bz2 spark-44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd.zip | |
Merge branch 'master' into scala-2.10-wip
Conflicts:
core/src/main/scala/org/apache/spark/rdd/RDD.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 aa5fe70470..3584e884f1 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -205,9 +205,9 @@ object SparkBuild extends Build { "log4j" % "log4j" % "1.2.17", "org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "slf4j-log4j12" % slf4jVersion, + "commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407 "com.ning" % "compress-lzf" % "0.8.4", "org.xerial.snappy" % "snappy-java" % "1.0.5", - "commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407 "org.ow2.asm" % "asm" % "4.0", "com.google.protobuf" % "protobuf-java" % "2.4.1", "com.typesafe.akka" %% "akka-remote" % "2.2.3" excludeAll(excludeNetty), @@ -226,6 +226,7 @@ object SparkBuild extends Build { "com.codahale.metrics" % "metrics-jvm" % "3.0.0", "com.codahale.metrics" % "metrics-json" % "3.0.0", "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" ) |