aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorKarthikTunga <karthik.tunga@gmail.com>2013-10-15 00:46:35 -0700
committerKarthikTunga <karthik.tunga@gmail.com>2013-10-15 00:46:35 -0700
commit6c6b146fc20f2ba85f1cf1bb9e35283ee195f59a (patch)
treef0c5819f78e3186206d6c79064155c3751711b66 /pom.xml
parentd2c86e718891b40e1cea8b0719462673b6b64e4e (diff)
parente33b1839e27249e232a2126cec67a38109e03243 (diff)
downloadspark-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.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 48bf38d200..18df1bf826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>