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 /core/pom.xml | |
| 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 'core/pom.xml')
| -rw-r--r-- | core/pom.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/pom.xml b/core/pom.xml index 468dd71249..e2033c9912 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -151,6 +151,10 @@ <artifactId>metrics-ganglia</artifactId> </dependency> <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-graphite</artifactId> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>test</scope> |