aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-02-25 15:38:21 -0800
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-02-25 15:38:21 -0800
commit6494cab19dda6cb44af506bd86cc75990ce87f70 (patch)
tree6e53635a1315c16b4dee76e7fe57bf24782d0ebb
parent6a78ef0578d16d133bf351476019763d7e4178ea (diff)
downloadspark-6494cab19dda6cb44af506bd86cc75990ce87f70.tar.gz
spark-6494cab19dda6cb44af506bd86cc75990ce87f70.tar.bz2
spark-6494cab19dda6cb44af506bd86cc75990ce87f70.zip
Update Hadoop dependency to 1.0.4
-rw-r--r--pom.xml2
-rw-r--r--project/SparkBuild.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 99eb17856a..ce8fa7734a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -514,7 +514,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 25c2328373..b19bfd5f9a 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -9,8 +9,8 @@ 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.3" for Apache releases, or "0.20.2-cdh3u5" for Cloudera Hadoop.
- val HADOOP_VERSION = "1.0.3"
+ // "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"
// For Hadoop 2 versions such as "2.0.0-mr1-cdh4.1.1", set the HADOOP_MAJOR_VERSION to "2"