merge from 2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83feb94e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83feb94e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83feb94e Branch: refs/heads/trunk Commit: 83feb94e7e0f2cb0f611b1c7cc306cda5d3ce01c Parents: dc2c0e7 df9d61c Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Aug 19 18:04:17 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Aug 19 18:04:17 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 ++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83feb94e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c652961,83966d7..d66f18e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,8 +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) + + + 2.0.0 + Merged from 1.2: + * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) + + 2.0.0-rc2 * enable vnodes by default (CASSANDRA-5869) * fix CAS contention timeout (CASSANDRA-5830) http://git-wip-us.apache.org/repos/asf/cassandra/blob/83feb94e/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------