diff options
author | KarthikTunga <karthik.tunga@gmail.com> | 2013-10-15 00:46:35 -0700 |
---|---|---|
committer | KarthikTunga <karthik.tunga@gmail.com> | 2013-10-15 00:46:35 -0700 |
commit | 6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a (patch) | |
tree | f0c5819f78e3186206d6c79064155c3751711b66 /pom.xml | |
parent | d2c86e718891b40e1cea8b0719462673b6b64e4e (diff) | |
parent | e33b1839e27249e232a2126cec67a38109e03243 (diff) | |
download | spark-6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a.tar.gz spark-6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a.tar.bz2 spark-6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a.zip |
Merge branch 'master' of https://github.com/apache/incubator-spark
Updating local branch
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -346,6 +346,17 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.5</version> + <exclusions> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> |