You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/08/21 17:52:23 UTC

[3/5] git commit: Fix CHANGES.txt

Fix CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8b220ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8b220ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8b220ba

Branch: refs/heads/trunk
Commit: c8b220ba10ff248238777ed1a627f1bc55261049
Parents: 26d0535
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Aug 21 18:46:59 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Aug 21 18:46:59 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8b220ba/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b966e0c..fdee261 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,8 @@ Merged from 1.2:
  * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
  * Don't announce schema version until we've loaded the changes locally
    (CASSANDRA-5904)
+ * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903)
+ * Properly handle parsing huge map and set literals (CASSANDRA-5893)
 
 
 2.0.0-rc2
@@ -45,15 +47,7 @@ Merged from 1.2:
  * Future-proof inter-major-version schema migrations (CASSANDRA-5845)
  * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table
    (CASSANDRA-5718)
- * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
- * cqlsh: add support for multiline comments (CASSANDRA-5798)
- * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
-   (CASSANDRA-5856)
- * Don't announce schema version until we've loaded the changes locally
-   (CASSANDRA-5904)
  * Add -no-snapshot option to scrub (CASSANDRA-5891)
- * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903)
- * Properly handle parsing huge map and set literals (CASSANDRA-5893)
 Merged from 1.1:
  * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)