Author: cutting
Date: Mon Oct 25 22:19:36 2010
New Revision: 1027289
URL: http://svn.apache.org/viewvc?rev=1027289&view=rev
Log:
HADOOP-6985. Suggest that HADOOP-OPTS be preserved in hadoop-env.sh.template.
Contributed by Ramkumar Vadali.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/conf/hadoop-env.sh.template
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1027289&r1=1027288&r2=1027289&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Mon Oct 25 22:19:36 2010
@@ -144,6 +144,9 @@ Trunk (unreleased changes)
HADOOP-7005. Update test-patch.sh to remove callback to Hudson. (nigel)
+ HADOOP-6985. Suggest that HADOOP_OPTS be preserved in
+ hadoop-env.sh.template. (Ramkumar Vadali via cutting)
+
OPTIMIZATIONS
HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).
Modified: hadoop/common/trunk/conf/hadoop-env.sh.template
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/conf/hadoop-env.sh.template?rev=1027289&r1=1027288&r2=1027289&view=diff
==============================================================================
--- hadoop/common/trunk/conf/hadoop-env.sh.template (original)
+++ hadoop/common/trunk/conf/hadoop-env.sh.template Mon Oct 25 22:19:36 2010
@@ -15,7 +15,7 @@
# export HADOOP_HEAPSIZE=2000
# Extra Java runtime options. Empty by default.
-# export HADOOP_OPTS=-server
+# if [ "$HADOOP_OPTS" == "" ]; then export HADOOP_OPTS=-server; else FOO+="
-server"; fi
# Command specific options appended to HADOOP_OPTS when specified
export HADOOP_NAMENODE_OPTS="-Dcom.sun.management.jmxremote
$HADOOP_NAMENODE_OPTS"
