MAPREDUCE-2428. start-mapred.sh script fails if HADOOP_HOME is not set. Contributed by Tom White
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1096649 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 3a10c00..d99215c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -660,6 +660,9 @@
MAPREDUCE-2437. SLive uses only part* files to generating the final report.
(shv)
+ MAPREDUCE-2428. start-mapred.sh script fails if HADOOP_HOME is not set.
+ (tomwhite via eli)
+
Release 0.21.1 - Unreleased
NEW FEATURES
diff --git a/bin/mapred-config.sh b/bin/mapred-config.sh
index 5256d52..8dbf508 100644
--- a/bin/mapred-config.sh
+++ b/bin/mapred-config.sh
@@ -27,6 +27,8 @@
. "$HADOOP_COMMON_HOME"/bin/hadoop-config.sh
elif [ -d "${HADOOP_HOME}" ]; then
. "$HADOOP_HOME"/bin/hadoop-config.sh
+elif [ -e "${HADOOP_MAPRED_HOME}"/bin/hadoop-config.sh ]; then
+ . "$HADOOP_MAPRED_HOME"/bin/hadoop-config.sh
else
echo "Hadoop common not found."
exit
