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/2e0279f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e0279f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e0279f8 Branch: refs/heads/trunk Commit: 2e0279f89ab0c404d25e2c04882ca1892d408b92 Parents: d35c823 7a300c2 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 21 09:03:28 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 21 09:03:28 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/thrift/ThriftValidation.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e0279f8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fe5908a,3cae204..551de18 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +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) + + 2.0.0 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) * Don't announce schema version until we've loaded the changes locally
