You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2011/03/26 21:38:22 UTC

svn commit: r1085798 - in /hbase/trunk: CHANGES.txt bin/hbase-config.sh

Author: todd
Date: Sat Mar 26 20:38:21 2011
New Revision: 1085798

URL: http://svn.apache.org/viewvc?rev=1085798&view=rev
Log:
HBASE-3703. hbase-config.sh needs to be updated so it can auto-detect the sun jdk provided by RHEL6

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/bin/hbase-config.sh

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1085798&r1=1085797&r2=1085798&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Mar 26 20:38:21 2011
@@ -211,6 +211,8 @@ Release 0.90.2 - Unreleased
    HBASE-3640  [replication] Transferring queues shouldn't be done inline with RS startup
    HBASE-3658  Alert when heap is over committed (Subbu M Iyer via Stack)
    HBASE-3681  Check the sloppiness of the region load before balancing (Ted Yu via JD)
+   HBASE-3703  hbase-config.sh needs to be updated so it can auto-detect
+               the sun jdk provided by RHEL6 (Bruno Mahe via todd)
 
 Release 0.90.1 - February 9th, 2011
 

Modified: hbase/trunk/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-config.sh?rev=1085798&r1=1085797&r2=1085798&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-config.sh (original)
+++ hbase/trunk/bin/hbase-config.sh Sat Mar 26 20:38:21 2011
@@ -84,6 +84,7 @@ fi
 if [ -z "$JAVA_HOME" ]; then
   for candidate in \
     /usr/lib/jvm/java-6-sun \
+    /usr/lib/jvm/java-1.6.0-sun-1.6.0.* \
     /usr/lib/j2sdk1.6-sun \
     /usr/java/jdk1.6* \
     /usr/java/jre1.6* \