Merge -r 1170045:1170046 from trunk onto branch-0.23. Fixes HADOOP-7626.

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

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -571,6 +571,8 @@ Release 0.23.0 - Unreleased
     HADOOP-7328. When a serializer class is missing, return null, not throw
     an NPE. (Harsh J Chouraria via todd)
 
+    HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-env.sh

@@ -12,7 +12,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/etc/hadoop"}
 # Extra Java CLASSPATH elements.  Automatically insert capacity-scheduler.
 for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
   if [ "$HADOOP_CLASSPATH" ]; then
-    export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$f
+    export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f
   else
     export HADOOP_CLASSPATH=$f
   fi
@@ -23,7 +23,7 @@ done
 #export HADOOP_NAMENODE_INIT_HEAPSIZE=""
 
 # Extra Java runtime options.  Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}"
+export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
 
 # Command specific options appended to HADOOP_OPTS when specified
 export HADOOP_NAMENODE_OPTS="-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"