Author: suresh
Date: Tue Nov 15 18:56:23 2011
New Revision: 1202378
URL: http://svn.apache.org/viewvc?rev=1202378&view=rev
Log:
HADOOP-7816. Allow HADOOP_HOME deprecated warning suppression based on config
specified in hadoop-env.sh Contributed by Dave Thompson.
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/bin/hadoop
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=1202378&r1=1202377&r2=1202378&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Tue Nov 15
18:56:23 2011
@@ -36,6 +36,9 @@ Release 0.20.205.1 - unreleased
if the override value is same as the final parameter value.
(Ravi Prakash via szetszwo)
+ HADOOP-7816. Allow HADOOP_HOME deprecated warning suppression based
+ on config specified in hadoop-env.sh (Dave Thompson via suresh)
+
BUG FIXES
HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh.
Modified: hadoop/common/branches/branch-0.20-security-205/bin/hadoop
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/bin/hadoop?rev=1202378&r1=1202377&r2=1202378&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20-security-205/bin/hadoop Tue Nov 15
18:56:23 2011
@@ -50,17 +50,17 @@
bin=`dirname "$0"`
bin=`cd "$bin"; pwd`
-if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
- echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
- echo 1>&2
-fi
-
if [ -e "$bin"/../libexec/hadoop-config.sh ]; then
. "$bin"/../libexec/hadoop-config.sh
else
. "$bin"/hadoop-config.sh
fi
+if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
+ echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
+ echo 1>&2
+fi
+
cygwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
