diff options
| author | Harvey Feng <harvey@databricks.com> | 2013-11-26 15:03:03 -0800 |
|---|---|---|
| committer | Harvey Feng <harvey@databricks.com> | 2013-11-26 15:03:03 -0800 |
| commit | afe4fe7f5ed9e5b82b641e72bbfc14f2d952c3be (patch) | |
| tree | acf60f9e27cd400fd7dce37419cfbad59177c3cc /project/SparkBuild.scala | |
| parent | a1a1c62a3eca61ccbd50a9fb391ab9a380dd1007 (diff) | |
| parent | cb976dfb50d62b8a686b6249ff3b24c0837bd613 (diff) | |
| download | spark-afe4fe7f5ed9e5b82b641e72bbfc14f2d952c3be.tar.gz spark-afe4fe7f5ed9e5b82b641e72bbfc14f2d952c3be.tar.bz2 spark-afe4fe7f5ed9e5b82b641e72bbfc14f2d952c3be.zip | |
Merge remote-tracking branch 'origin/master' into yarn-2.2
Conflicts:
yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 3dd7c8c962..2619c705bc 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -244,6 +244,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_2.9.3" % "0.3.1", "com.twitter" % "chill-java" % "0.3.1" ) |