diff options
| author | Dmitriy Lyubimov <dlyubimov@apache.org> | 2013-07-27 22:53:01 -0700 |
|---|---|---|
| committer | Dmitriy Lyubimov <dlyubimov@apache.org> | 2013-07-27 22:53:01 -0700 |
| commit | b241fcfb35aeaedbcbc35df3f12ecc300c4302ab (patch) | |
| tree | 82daa22b501e38589591f2cf2f5955a60f6eb8f3 | |
| parent | 23f3e0f117a7cc4fab0c710ea3583f2aee68d663 (diff) | |
| download | spark-b241fcfb35aeaedbcbc35df3f12ecc300c4302ab.tar.gz spark-b241fcfb35aeaedbcbc35df3f12ecc300c4302ab.tar.bz2 spark-b241fcfb35aeaedbcbc35df3f12ecc300c4302ab.zip | |
reverting changes to SparkBuild.scala
| -rw-r--r-- | project/SparkBuild.scala | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 998747c68f..f3f67b57c8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -26,14 +26,14 @@ import AssemblyKeys._ object SparkBuild extends Build { // Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or // "1.0.4" for Apache releases, or "0.20.2-cdh3u5" for Cloudera Hadoop. - //val HADOOP_VERSION = "1.0.4" - //val HADOOP_MAJOR_VERSION = "1" - //val HADOOP_YARN = false + val HADOOP_VERSION = "1.0.4" + val HADOOP_MAJOR_VERSION = "1" + val HADOOP_YARN = false // For Hadoop 2 versions such as "2.0.0-mr1-cdh4.1.1", set the HADOOP_MAJOR_VERSION to "2" - val HADOOP_VERSION = "2.0.0-cdh4.3.0" - val HADOOP_MAJOR_VERSION = "2" - val HADOOP_YARN = true + //val HADOOP_VERSION = "2.0.0-mr1-cdh4.1.1" + //val HADOOP_MAJOR_VERSION = "2" + //val HADOOP_YARN = false // For Hadoop 2 YARN support //val HADOOP_VERSION = "2.0.2-alpha" @@ -185,7 +185,6 @@ object SparkBuild extends Build { if (HADOOP_YARN) { Seq( // Exclude rule required for all ? - "org.apache.hadoop" % "hadoop-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm), "org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm), "org.apache.hadoop" % "hadoop-yarn-api" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm), "org.apache.hadoop" % "hadoop-yarn-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm), |