diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-09 14:20:01 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-05-09 14:20:01 -0700 |
| commit | 012c9e5ab072239e07202abe4775b434be6e32b9 (patch) | |
| tree | dda701387d3725199faf4c3a56dd57c30ca5f364 /project | |
| parent | 42bbe89f04383cd6cc182fc3627ce55e11ede33f (diff) | |
| download | spark-012c9e5ab072239e07202abe4775b434be6e32b9.tar.gz spark-012c9e5ab072239e07202abe4775b434be6e32b9.tar.bz2 spark-012c9e5ab072239e07202abe4775b434be6e32b9.zip | |
Revert "Merge pull request #596 from esjewett/master" because the
dependency on hbase introduces netty-3.2.2 which conflicts with
netty-3.5.3 already in Spark. This caused multiple test failures.
This reverts commit 0f1b7a06e1f6782711170234f105f1b277e3b04c, reversing
changes made to aacca1b8a85bd073ce185a06d6470b070761b2f4.
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 6f5607d31c..190d723435 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -200,11 +200,7 @@ object SparkBuild extends Build { def examplesSettings = sharedSettings ++ Seq( name := "spark-examples", - resolvers ++= Seq("Apache HBase" at "https://repository.apache.org/content/repositories/releases"), - libraryDependencies ++= Seq( - "com.twitter" % "algebird-core_2.9.2" % "0.1.11", - "org.apache.hbase" % "hbase" % "0.94.6" - ) + libraryDependencies ++= Seq("com.twitter" % "algebird-core_2.9.2" % "0.1.11") ) def bagelSettings = sharedSettings ++ Seq(name := "spark-bagel") |