Skip to content
Snippets Groups Projects
Commit f1f92c88 authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Build against Hadoop 1 by default

parent 0f45347c
No related branches found
No related tags found
No related merge requests found
...@@ -11,8 +11,9 @@ import twirl.sbt.TwirlPlugin._ ...@@ -11,8 +11,9 @@ import twirl.sbt.TwirlPlugin._
object SparkBuild extends Build { object SparkBuild extends Build {
// Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or // 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. // "1.0.4" for Apache releases, or "0.20.2-cdh3u5" for Cloudera Hadoop.
//val HADOOP_VERSION = "1.0.4" val HADOOP_VERSION = "1.0.4"
//val HADOOP_MAJOR_VERSION = "1" 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" // 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" //val HADOOP_VERSION = "2.0.0-mr1-cdh4.1.1"
...@@ -20,10 +21,9 @@ object SparkBuild extends Build { ...@@ -20,10 +21,9 @@ object SparkBuild extends Build {
//val HADOOP_YARN = false //val HADOOP_YARN = false
// For Hadoop 2 YARN support // For Hadoop 2 YARN support
// val HADOOP_VERSION = "0.23.7" //val HADOOP_VERSION = "2.0.2-alpha"
val HADOOP_VERSION = "2.0.2-alpha" //val HADOOP_MAJOR_VERSION = "2"
val HADOOP_MAJOR_VERSION = "2" //val HADOOP_YARN = true
val HADOOP_YARN = true
lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, repl, examples, bagel, streaming) lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, repl, examples, bagel, streaming)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment