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/48cfe0b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48cfe0b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48cfe0b1 Branch: refs/heads/trunk Commit: 48cfe0b1050aa3fbf5bf377c00a31602f095dc26 Parents: d362ba5 67accea Author: Jonathan Ellis <[email protected]> Authored: Sat Nov 16 10:31:26 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Nov 16 10:31:26 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48cfe0b1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 458d1ba,a283387..fbe7292 --- 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 + * 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) * Fix trying to hint timed out counter writes (CASSANDRA-6322) http://git-wip-us.apache.org/repos/asf/cassandra/blob/48cfe0b1/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------
