From dd74bd4d422115e7ff22b76c09d854d9c4f4a8f4 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Tue, 23 Feb 2010 17:12:21 +0000
Subject: [PATCH] merge from 0.5

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915441 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 38de0d8708..51f9193538 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -39,7 +39,9 @@
  * allow larger numbers of keys (> 140M) in a sstable bloom filter
    (CASSANDRA-790)
  * include jvm argument improvements from CASSANDRA-504 in debian package
- * change streaming chunk size to 32MB (was 64MB) (CASSANDRA-795)
+ * change streaming chunk size to 32MB to accomodate Windows XP limitations
+   (was 64MB) (CASSANDRA-795)
+ * fix get_range_slice returning results in the wrong order (CASSANDRA-781)
  
 
 0.5.0 final