You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2009/06/05 01:46:45 UTC

svn commit: r781873 - /hadoop/hbase/trunk/CHANGES.txt

Author: apurtell
Date: Thu Jun  4 23:46:45 2009
New Revision: 781873

URL: http://svn.apache.org/viewvc?rev=781873&view=rev
Log:
fix CHANGES.txt

Modified:
    hadoop/hbase/trunk/CHANGES.txt

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=781873&r1=781872&r2=781873&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Jun  4 23:46:45 2009
@@ -300,10 +300,8 @@
    HBASE-1464  Add hbase.regionserver.logroll.period to hbase-default
    HBASE-1192  LRU-style map for the block cache (Jon Gray and Ryan Rawson
                via Stack)
-<<<<<<< .mine
    HBASE-1466  Binary keys are not first class citizens
                (Ryan Rawson via Stack)
-=======
    HBASE-1445  Add the ability to start a master from any machine
    HBASE-1474  Add zk attributes to list of attributes 
                in master and regionserver UIs
@@ -311,9 +309,6 @@
    HBASE-1478  Remove hbase master options from shell (Nitay Joffe via Stack)
    HBASE-1462  hclient still seems to depend on master
    HBASE-1143  region count erratic in master UI
-               (kill server hosting root or meta and see how count goes awry)....
-               make sure you have a bunch of reions in there
->>>>>>> .r781864
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue