From f1f92c88eb2960a16d33bf7dd291c8ce58f665de Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Mon, 29 Apr 2013 17:08:45 -0700
Subject: [PATCH] Build against Hadoop 1 by default
---
project/SparkBuild.scala | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 7bd6c4c235..f2410085d8 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -11,8 +11,9 @@ import twirl.sbt.TwirlPlugin._
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_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-mr1-cdh4.1.1"
@@ -20,10 +21,9 @@ object SparkBuild extends Build {
//val HADOOP_YARN = false
// For Hadoop 2 YARN support
- // val HADOOP_VERSION = "0.23.7"
- val HADOOP_VERSION = "2.0.2-alpha"
- val HADOOP_MAJOR_VERSION = "2"
- val HADOOP_YARN = true
+ //val HADOOP_VERSION = "2.0.2-alpha"
+ //val HADOOP_MAJOR_VERSION = "2"
+ //val HADOOP_YARN = true
lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, repl, examples, bagel, streaming)
--
GitLab