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/0619da2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0619da2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0619da2a Branch: refs/heads/trunk Commit: 0619da2aeab0be2da0b4db47872e0dd7c33c2457 Parents: fa86ce8 b457156 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 13 09:38:02 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 13 09:38:02 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 29 ++++++++++++++++++-- .../cassandra/net/MessageDeliveryTask.java | 10 +++++++ 3 files changed, 38 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0619da2a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 727c97d,e4f1862..6213580 --- 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 + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) * Fix trying to hint timed out counter writes (CASSANDRA-6322) * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) * Avoid flushing compaction_history after each operation (CASSANDRA-6287) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0619da2a/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
