diff options
| author | Cheng Lian <lian@databricks.com> | 2015-06-28 19:34:59 -0700 |
|---|---|---|
| committer | Yin Huai <yhuai@databricks.com> | 2015-06-28 19:34:59 -0700 |
| commit | 00a9d22bd6ef42c1e7d8dd936798b449bb3a9f67 (patch) | |
| tree | dc9e0eae325812a13f9d2f67976a1e293bff1757 | |
| parent | 24fda7381171738cbbbacb5965393b660763e562 (diff) | |
| download | spark-00a9d22bd6ef42c1e7d8dd936798b449bb3a9f67.tar.gz spark-00a9d22bd6ef42c1e7d8dd936798b449bb3a9f67.tar.bz2 spark-00a9d22bd6ef42c1e7d8dd936798b449bb3a9f67.zip | |
[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
| -rwxr-xr-x | dev/run-tests.py | 2 | ||||
| -rw-r--r-- | pom.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dev/run-tests.py b/dev/run-tests.py index 3533e0c857..eb79a2a502 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"], @@ -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> |