Author: eli
Date: Tue Apr 26 03:32:29 2011
New Revision: 1096649
URL: http://svn.apache.org/viewvc?rev=1096649&view=rev
Log:
MAPREDUCE-2428. start-mapred.sh script fails if HADOOP_HOME is not set.
Contributed by Tom White
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/bin/mapred-config.sh
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1096649&r1=1096648&r2=1096649&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Tue Apr 26 03:32:29 2011
@@ -660,6 +660,9 @@ Release 0.22.0 - Unreleased
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
Modified: hadoop/mapreduce/trunk/bin/mapred-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/bin/mapred-config.sh?rev=1096649&r1=1096648&r2=1096649&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/bin/mapred-config.sh (original)
+++ hadoop/mapreduce/trunk/bin/mapred-config.sh Tue Apr 26 03:32:29 2011
@@ -27,6 +27,8 @@ if [ -d "${HADOOP_COMMON_HOME}" ]; then
. "$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
