Author: omalley
Date: Thu Jun 9 20:46:22 2011
New Revision: 1134069
URL: http://svn.apache.org/viewvc?rev=1134069&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-204/CHANGES.txt
hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1134069&r1=1134068&r2=1134069&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 9
20:46:22 2011
@@ -15,6 +15,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-204/bin/hadoop-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh?rev=1134069&r1=1134068&r2=1134069&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh
(original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh Thu
Jun 9 20:46:22 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"`/..
