You are viewing a plain text version of this content. The canonical link for it is here.

Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/06/09 22:44:10 UTC

svn commit: r1134067 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt bin/hadoop-config.sh

Author: omalley
Date: Thu Jun  9 20:44:10 2011
New Revision: 1134067

URL: http://svn.apache.org/viewvc?rev=1134067&view=rev
Log:
HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from
trying to use the wrong bin directory. (omalley)

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1134067&r1=1134066&r2=1134067&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Jun  9 20:44:10 2011
@@ -88,6 +88,9 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from
+    trying to use the wrong bin directory. (omalley)
+
     HADOOP-7369. Fix permissions in tarball for sbin/* and libexec/* (omalley)
 
     HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley)

Modified: hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh?rev=1134067&r1=1134066&r2=1134067&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh (original)
+++ hadoop/common/branches/branch-0.20-security/bin/hadoop-config.sh Thu Jun  9 20:44:10 2011
@@ -25,10 +25,10 @@ script="$(basename -- "$this")"
 this="$common_bin/$script"
 
 # convert relative path to absolute path
-bin=`dirname "$this"`
+config_bin=`dirname "$this"`
 script=`basename "$this"`
-bin=`cd "$bin"; pwd`
-this="$bin/$script"
+config_bin=`cd "$config_bin"; pwd`
+this="$config_bin/$script"
 
 # the root of the Hadoop installation
 export HADOOP_PREFIX=`dirname "$this"`/..