You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 05:35:47 UTC
svn commit: r1079100 - in /hadoop/common/branches/yahoo-merge: CHANGES.txt
conf/hadoop-env.sh.template
Author: omalley
Date: Tue Mar 8 04:35:47 2011
New Revision: 1079100
URL: http://svn.apache.org/viewvc?rev=1079100&view=rev
Log:
commit 731753243cb8c5a33ef862611b9536b464cc1777
Author: Douglass Cutting <cu...@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
Modified:
hadoop/common/branches/yahoo-merge/CHANGES.txt
hadoop/common/branches/yahoo-merge/conf/hadoop-env.sh.template
Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1079100&r1=1079099&r2=1079100&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Tue Mar 8 04:35:47 2011
@@ -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(..).
Modified: hadoop/common/branches/yahoo-merge/conf/hadoop-env.sh.template
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/conf/hadoop-env.sh.template?rev=1079100&r1=1079099&r2=1079100&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/conf/hadoop-env.sh.template (original)
+++ hadoop/common/branches/yahoo-merge/conf/hadoop-env.sh.template Tue Mar 8 04:35:47 2011
@@ -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"