Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1162187:1162188 from trunk to branch-0.23 to fix MAPREDUCE-2885. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162189 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-08-26 17:58:13 +00:00
parent ee8678f7d7
commit 4367a863be
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -1150,6 +1150,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-2881. Fix to include log4j 1.2.16 depenency (gkesavan) MAPREDUCE-2881. Fix to include log4j 1.2.16 depenency (gkesavan)
MAPREDUCE-2885. Fix mapred-config.sh to look for hadoop-config.sh in
HADOOP_COMMON_HOME/libexec. (acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/bin/mapred-config.sh
View File

@ -24,6 +24,8 @@ bin=`cd "$bin"; pwd`
if [ -e "$bin/../libexec/hadoop-config.sh" ]; then if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
. "$bin/../libexec/hadoop-config.sh" . "$bin/../libexec/hadoop-config.sh"
elif [ -e "${HADOOP_COMMON_HOME}/libexec/hadoop-config.sh" ]; then
. "$HADOOP_COMMON_HOME"/libexec/hadoop-config.sh
elif [ -e "${HADOOP_COMMON_HOME}/bin/hadoop-config.sh" ]; then elif [ -e "${HADOOP_COMMON_HOME}/bin/hadoop-config.sh" ]; then
. "$HADOOP_COMMON_HOME"/bin/hadoop-config.sh . "$HADOOP_COMMON_HOME"/bin/hadoop-config.sh
elif [ -e "${HADOOP_HOME}/bin/hadoop-config.sh" ]; then elif [ -e "${HADOOP_HOME}/bin/hadoop-config.sh" ]; then