hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r1162188 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt bin/mapred-config.sh
Date Fri, 26 Aug 2011 17:55:53 GMT
Author: acmurthy
Date: Fri Aug 26 17:55:53 2011
New Revision: 1162188

URL: http://svn.apache.org/viewvc?rev=1162188&view=rev
Log:
MAPREDUCE-2885. Fix mapred-config.sh to look for hadoop-config.sh in HADOOP_COMMON_HOME/libexec.


Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1162188&r1=1162187&r2=1162188&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Aug 26 17:55:53 2011
@@ -1152,6 +1152,9 @@ Release 0.23.0 - Unreleased
    
     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
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh?rev=1162188&r1=1162187&r2=1162188&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh Fri Aug 26 17:55:53
2011
@@ -24,6 +24,8 @@ bin=`cd "$bin"; pwd`
 
 if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
   . "$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
   . "$HADOOP_COMMON_HOME"/bin/hadoop-config.sh
 elif [ -e "${HADOOP_HOME}/bin/hadoop-config.sh" ]; then



Mime
View raw message