HADOOP-8010 merge to branch-1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1238999 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -173,6 +173,8 @@ Release 1.0.1 - 2012.01.30
     HADOOP-7964. Deadlock in NetUtils and SecurityUtil class initialization.
     (Daryn Sharp via suresh)
 
+    HADOOP-8010. hadoop-config.sh errors when HADOOP_HOME_WARN_SUPPRESS is set 
+    to true and HADOOP_HOME is present. (Roman Shaposhnik via mattf)
 
 Release 1.0.0 - 2011.12.15
 

bin/hadoop-config.sh

@@ -70,7 +70,7 @@ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
   . "${HADOOP_CONF_DIR}/hadoop-env.sh"
 fi
 
-if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
+if [ "$HADOOP_HOME_WARN_SUPPRESS" = "" ] && [ "$HADOOP_HOME" != "" ]; then
   echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
   echo 1>&2
 fi