Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 3096d3e1a -> 49ff1e527
HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha)
(cherry picked from commit db145e0c9add81c74d853baa8187005f97ea1b53)
Conflicts:
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/49ff1e52
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/49ff1e52
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/49ff1e52
Branch: refs/heads/branch-2.7
Commit: 49ff1e527660d7c3b85320b508f676910014c536
Parents: 3096d3e
Author: Karthik Kambatla <[email protected]>
Authored: Thu Oct 1 11:29:50 2015 -0700
Committer: Karthik Kambatla <[email protected]>
Committed: Thu Oct 1 11:36:12 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
.../hadoop-common/src/main/bin/hadoop-config.sh | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49ff1e52/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 6518210..a574351 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -40,6 +40,8 @@ Release 2.7.2 - UNRELEASED
HADOOP-12213. Interrupted exception can occur when Client#stop is called.
(Kuhu Shukla via ozawa)
+
+ HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha)
Release 2.7.1 - 2015-07-06
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49ff1e52/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
index 3c3c19f..fab3db4 100644
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
@@ -250,8 +250,11 @@
TOOL_PATH="${TOOL_PATH:-$HADOOP_PREFIX/share/hadoop/tools/lib/*}"
HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.dir=$HADOOP_LOG_DIR"
HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.file=$HADOOP_LOGFILE"
-HADOOP_HOME=$HADOOP_PREFIX
-if $cygwin; then
+
+if [ "$HADOOP_HOME" = "" ]; then
+ HADOOP_HOME=$HADOOP_PREFIX
+fi
+if [ "$cygwin" = true ]; then
HADOOP_HOME=$(cygpath -w "$HADOOP_HOME" 2>/dev/null)
fi
export HADOOP_HOME
