merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/327cab8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/327cab8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/327cab8a Branch: refs/heads/trunk Commit: 327cab8ab0fc4b7944df77beddca34a89bf41a56 Parents: d64aa99 cf8fa6e Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 31 09:24:16 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 31 09:24:16 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/327cab8a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ee4704c,d439032..cc878e4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +2.1 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + + 2.0.3 + * Fix repair assertion error when tombstones expire (CASSANDRA-6277) * Skip loading corrupt key cache (CASSANDRA-6260) * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) * Compact hottest sstables first and optionally omit coldest from
