Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78d78cf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78d78cf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78d78cf6 Branch: refs/heads/trunk Commit: 78d78cf649d65ad16fdcbc54bb69f6b23bd7f2e6 Parents: 56008de b0280cb Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Aug 24 02:17:38 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Aug 24 02:17:38 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 22 ++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78d78cf6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2d30407,b68e442..988255b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ +2.0.1 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + * Add ability for CQL3 to list partition keys (CASSANDRA-4536) + * Improve native protocol serialization (CASSANDRA-5664) + + 2.0.0 * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931) Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) * Don't announce schema version until we've loaded the changes locally http://git-wip-us.apache.org/repos/asf/cassandra/blob/78d78cf6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
