From f9cc1fbf272606ce0b679936ef38429b20916cc1 Mon Sep 17 00:00:00 2001
From: Jey Kottalam <jey@cs.berkeley.edu>
Date: Wed, 21 Aug 2013 17:12:03 -0700
Subject: [PATCH] Remove references to unsupported Hadoop versions
---
README.md | 2 +-
docs/building-with-maven.md | 2 +-
project/SparkBuild.scala | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 9b2c1a9c4d..8502410c52 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Hadoop, you must build Spark against the same version that your cluster runs.
You can change the version by setting the `SPARK_HADOOP_VERSION` environment
when building Spark.
-For Apache Hadoop versions 1.x, 0.20.x, Cloudera CDH MRv1, and other Hadoop
+For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop
versions without YARN, use:
# Apache Hadoop 1.2.1
diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md
index d71d94fa63..a9f2cb8a7a 100644
--- a/docs/building-with-maven.md
+++ b/docs/building-with-maven.md
@@ -12,7 +12,7 @@ Building Spark using Maven Requires Maven 3 (the build process is tested with Ma
To enable support for HDFS and other Hadoop-supported storage systems, specify the exact Hadoop version by setting the "hadoop.version" property. If unset, Spark will build against Hadoop 1.0.4 by default.
-For Apache Hadoop versions 1.x, 0.20.x, Cloudera CDH MRv1, and other Hadoop versions without YARN, use:
+For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions without YARN, use:
# Apache Hadoop 1.2.1
$ mvn -Dhadoop.version=1.2.1 clean install
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 81080741ca..cc09bf7dd2 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -24,10 +24,9 @@ import AssemblyKeys._
//import com.jsuereth.pgp.sbtplugin.PgpKeys._
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.
- // Note that these variables can be set through the environment variables
- // SPARK_HADOOP_VERSION and SPARK_WITH_YARN.
+ // Hadoop version to build against. For example, "1.0.4" for Apache releases, or
+ // "2.0.0-mr1-cdh4.2.0" for Cloudera Hadoop. Note that these variables can be set
+ // through the environment variables SPARK_HADOOP_VERSION and SPARK_WITH_YARN.
val DEFAULT_HADOOP_VERSION = "1.0.4"
val DEFAULT_WITH_YARN = false
--
GitLab