diff options
author | Raymond Liu <raymond.liu@intel.com> | 2013-11-14 13:57:02 +0800 |
---|---|---|
committer | Raymond Liu <raymond.liu@intel.com> | 2013-11-15 10:22:31 +0800 |
commit | d4cd32330e1e4ac83b38bc922a9d3fd85f85f606 (patch) | |
tree | 0404cdc072cda7cafa666a3c7db1dd0f9af9a84f /project | |
parent | a60620b76a98e236f1e4ffda7a2f289e7917b957 (diff) | |
download | spark-d4cd32330e1e4ac83b38bc922a9d3fd85f85f606.tar.gz spark-d4cd32330e1e4ac83b38bc922a9d3fd85f85f606.tar.bz2 spark-d4cd32330e1e4ac83b38bc922a9d3fd85f85f606.zip |
Some fixes for previous master merge commits
Diffstat (limited to 'project')
-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 9a3cbbe7d2..26e6a8326c 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -227,6 +227,7 @@ object SparkBuild extends Build { "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), "org.apache.avro" % "avro" % "1.7.4", "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), + "org.apache.zookeeper" % "zookeeper" % "3.4.5" excludeAll(excludeNetty), "com.codahale.metrics" % "metrics-core" % "3.0.0", "com.codahale.metrics" % "metrics-jvm" % "3.0.0", "com.codahale.metrics" % "metrics-json" % "3.0.0", |