commit 731753243cb8c5a33ef862611b9536b464cc1777

Author: Douglass Cutting <cutting@apache.org>
Date:   Mon Oct 25 22:19:36 2010 +0000

    HADOOP-6985.  Suggest that HADOOP-OPTS be preserved in hadoop-env.sh.template.  Contributed by Ramkumar Vadali.
    
    git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1027289 13f79535-47bb-0310-9956-ffa450edef68


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1079100 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -146,6 +146,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(..).

conf/hadoop-env.sh.template

@@ -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"