Author: ddas
Date: Tue Sep 13 05:14:18 2011
New Revision: 1170042
URL: http://svn.apache.org/viewvc?rev=1170042&view=rev
Log:
HADOOP-7626. Bugfix for a config generator. Contributed by Eric Yang.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.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=1170042&r1=1170041&r2=1170042&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Tue Sep 13 05:14:18
2011
@@ -142,6 +142,8 @@ Release 0.20.205.0 - unreleased
HDFS-1260. Block lost when multiple DNs trying to recover it to different
genstamps. (Todd Lipcon via jitendra)
+ HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified:
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh?rev=1170042&r1=1170041&r2=1170042&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
(original)
+++
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
Tue Sep 13 05:14:18 2011
@@ -12,7 +12,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR
# 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}"
