hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1133524 - in /hadoop/common/branches/branch-0.20-security-205: CHANGES.txt bin/hadoop-config.sh
Date Wed, 08 Jun 2011 19:41:17 GMT
Author: omalley
Date: Wed Jun  8 19:41:17 2011
New Revision: 1133524

URL: http://svn.apache.org/viewvc?rev=1133524&view=rev
Log:
HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley)

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

Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1133524&r1=1133523&r2=1133524&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Wed Jun  8 19:41:17 2011
@@ -83,6 +83,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-205/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh?rev=1133524&r1=1133523&r2=1133524&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh (original)
+++ hadoop/common/branches/branch-0.20-security-205/bin/hadoop-config.sh Wed Jun  8 19:41:17
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 ]



Mime
View raw message