Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/414ba406 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/414ba406 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/414ba406 Branch: refs/heads/trunk Commit: 414ba406de1e002e4f8e13d4c8137764f17c6675 Parents: 48cfe0b 08167d6 Author: Jonathan Ellis <[email protected]> Authored: Sat Nov 16 10:34:28 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Nov 16 10:34:28 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableReader.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/414ba406/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fbe7292,cd6895f..442c7df --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871) + + 2.0.3 + * Cancel read meter task when closing SSTR (CASSANDRA-6358) * free off-heap IndexSummary during bulk (CASSANDRA-6359) * Recover from IOException in accept() thread (CASSANDRA-6349) * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) http://git-wip-us.apache.org/repos/asf/cassandra/blob/414ba406/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------
