From 4cadb9a7a87a20d80c1843e2e142a1b67ccb861b Mon Sep 17 00:00:00 2001
From: Ryan Rawson <rawson@apache.org>
Date: Sat, 15 May 2010 00:32:52 +0000
Subject: [PATCH] HBASE-2474, HBASE-2509, HBASE-2037, HBASE-2248 CHANGES.txt
 updates

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@944535 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 63e832a3958..cafbc2f3fe4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -318,6 +318,8 @@ Release 0.21.0 - Unreleased
    HBASE-2138  unknown metrics type
    HBASE-2551  Forward port fixes that are in branch but not in trunk (part of
                the merge of old 0.20 into TRUNK task) -- part 1.
+   HBASE-2474  Bug in HBASE-2248 - mixed version reads (not allowed by spec)
+   HBASE-2509  NPEs in various places, HRegion.get, HRS.close
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
@@ -574,6 +576,10 @@ Release 0.21.0 - Unreleased
                (Todd Lipcon via Stack)
    HBASE-2547  [mvn] assembly:assembly does not include hbase-X.X.X-test.jar
                (Paul Smith via Stack)
+   HBASE-2037  The core elements of HBASE-2037: refactoring flushing, and adding 
+   	       configurability in which HRegion subclass is instantiated
+   HBASE-2248  Provide new non-copy mechanism to assure atomic reads in get and scan
+
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts