spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yh...@apache.org
Subject spark git commit: [SPARK-7845] [BUILD] Bumping default Hadoop version used in profile hadoop-1 to 1.2.1
Date Mon, 29 Jun 2015 02:35:02 GMT
Repository: spark
Updated Branches:
  refs/heads/master 24fda7381 -> 00a9d22bd


[SPARK-7845] [BUILD] Bumping default Hadoop version used in profile hadoop-1 to 1.2.1

PR #5694 reverted PR #6384 while refactoring `dev/run-tests` to `dev/run-tests.py`. Also,
PR #6384 didn't bump Hadoop 1 version defined in POM.

Author: Cheng Lian <lian@databricks.com>

Closes #7062 from liancheng/spark-7845 and squashes the following commits:

c088b72 [Cheng Lian] Bumping default Hadoop version used in profile hadoop-1 to 1.2.1


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/00a9d22b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/00a9d22b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/00a9d22b

Branch: refs/heads/master
Commit: 00a9d22bd6ef42c1e7d8dd936798b449bb3a9f67
Parents: 24fda73
Author: Cheng Lian <lian@databricks.com>
Authored: Sun Jun 28 19:34:59 2015 -0700
Committer: Yin Huai <yhuai@databricks.com>
Committed: Sun Jun 28 19:34:59 2015 -0700

----------------------------------------------------------------------
 dev/run-tests.py | 2 +-
 pom.xml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/00a9d22b/dev/run-tests.py
----------------------------------------------------------------------
diff --git a/dev/run-tests.py b/dev/run-tests.py
index 3533e0c..eb79a2a 100755
--- a/dev/run-tests.py
+++ b/dev/run-tests.py
@@ -261,7 +261,7 @@ def get_hadoop_profiles(hadoop_version):
     """
 
     sbt_maven_hadoop_profiles = {
-        "hadoop1.0": ["-Phadoop-1", "-Dhadoop.version=1.0.4"],
+        "hadoop1.0": ["-Phadoop-1", "-Dhadoop.version=1.2.1"],
         "hadoop2.0": ["-Phadoop-1", "-Dhadoop.version=2.0.0-mr1-cdh4.1.1"],
         "hadoop2.2": ["-Pyarn", "-Phadoop-2.2"],
         "hadoop2.3": ["-Pyarn", "-Phadoop-2.3", "-Dhadoop.version=2.3.0"],

http://git-wip-us.apache.org/repos/asf/spark/blob/00a9d22b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 00f5016..4c18bd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1686,7 +1686,7 @@
     <profile>
       <id>hadoop-1</id>
       <properties>
-        <hadoop.version>1.0.4</hadoop.version>
+        <hadoop.version>1.2.1</hadoop.version>
         <protobuf.version>2.4.1</protobuf.version>
         <hbase.version>0.98.7-hadoop1</hbase.version>
         <avro.mapred.classifier>hadoop1</avro.mapred.classifier>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message