diff options
| author | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
|---|---|---|
| committer | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
| commit | 383e151fd7138cc6a143b3a38037cc3038c2a8b9 (patch) | |
| tree | 0dbb2c0d8fdeff4c37a577eb96acb87ee7838a16 /core/pom.xml | |
| parent | 20c65bc334091d8d05fb680551155aa182d98f7d (diff) | |
| parent | c4c1db2dd5b2ec0a8182369ecdb0e14f4e199822 (diff) | |
| download | spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.gz spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.bz2 spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.zip | |
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/SparkContext.scala
project/SparkBuild.scala
Diffstat (limited to 'core/pom.xml')
| -rw-r--r-- | core/pom.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/pom.xml b/core/pom.xml index 076236e20a..382473a3b3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -37,6 +37,11 @@ <artifactId>hadoop-client</artifactId> </dependency> <dependency> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + <version>0.7.1</version> + </dependency> + <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </dependency> @@ -147,6 +152,10 @@ <artifactId>metrics-json</artifactId> </dependency> <dependency> + <groupId>com.codahale.metrics</groupId> + <artifactId>metrics-ganglia</artifactId> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>test</scope> |