svn commit: r1055718 - in /hbase/branches/0.90: CHANGES.txt conf/hbase-env.sh

[ap...@apache.org]

Author: apurtell
Date: Thu Jan  6 02:53:25 2011
New Revision: 1055718

URL: http://svn.apache.org/viewvc?rev=1055718&view=rev
Log:
HBASE-3423 hbase-env.sh overrides HBASE_OPTS incorrectly

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/conf/hbase-env.sh

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1055718&r1=1055717&r2=1055718&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Jan  6 02:53:25 2011
@@ -780,6 +780,8 @@ Release 0.90.0 - Unreleased
    HBASE-3412  HLogSplitter should handle missing HLogs
    HBASE-3420  Handling a big rebalance, we can queue multiple instances
                of a Close event; messes up state
+   HBASE-3423  hbase-env.sh over-rides HBASE_OPTS incorrectly (Ted Dunning via
+               Andrew Purtell)
 
 
   IMPROVEMENTS

Modified: hbase/branches/0.90/conf/hbase-env.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/conf/hbase-env.sh?rev=1055718&r1=1055717&r2=1055718&view=diff
==============================================================================
--- hbase/branches/0.90/conf/hbase-env.sh (original)
+++ hbase/branches/0.90/conf/hbase-env.sh Thu Jan  6 02:53:25 2011
@@ -34,7 +34,7 @@
 # Below are what we set by default.  May only work with SUN JVM.
 # For more on why as well as other possible settings,
 # see http://wiki.apache.org/hadoop/PerformanceTuning
-export HBASE_OPTS="-ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
+export HBASE_OPTS="$HBASE_OPTS -ea -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 
 # Uncomment below to enable java garbage collection logging.
 # export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log"