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/08 21:39:56 UTC
svn commit: r1133523 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt bin/hadoop-config.sh
Author: omalley
Date: Wed Jun 8 19:39:56 2011
New Revision: 1133523
URL: http://svn.apache.org/viewvc?rev=1133523&view=rev
Log:
HADOOP-7356. Fix bin/hadoop scripts (eyang via 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=1133523&r1=1133522&r2=1133523&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Jun 8 19:39:56 2011
@@ -82,6 +82,8 @@ Release 0.20.204.0 - unreleased
BUG FIXES
+ HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley)
+
MAPREDUCE-2316. Updated CapacityScheduler documentation. (acmurthy)
MAPREDUCE-2447. Fix Child.java to set Task.jvmContext sooner to avoid
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=1133523&r1=1133522&r2=1133523&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 Wed Jun 8 19:39:56 2011
@@ -32,7 +32,11 @@ this="$bin/$script"
# the root of the Hadoop installation
export HADOOP_PREFIX=`dirname "$this"`/..
-export HADOOP_HOME=${HADOOP_PREFIX}/share/hadoop
+if [ -d ${HADOOP_PREFIX}/share/hadoop ]; then
+ export HADOOP_HOME=${HADOOP_PREFIX}/share/hadoop
+else
+ export HADOOP_HOME=${HADOOP_PREFIX}
+fi
#check to see if the conf dir is given as an optional argument
if [ $# -gt 1 ]