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/6c379343 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c379343 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c379343 Branch: refs/heads/trunk Commit: 6c379343561766724e48d1d7cf98e282e8ec91dd Parents: 303702d 16bb898 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Oct 18 23:30:30 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Oct 18 23:30:30 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/gms/FailureDetector.java | 25 +++++++++++--------- .../cassandra/utils/BoundedStatsDeque.java | 12 +++++----- .../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++---------- .../cassandra/utils/BoundedStatsDequeTest.java | 20 ++++++++-------- 5 files changed, 43 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c379343/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ce88013,f4d6980..ba1b776 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +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) + + 2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) * Fix FileCacheService regressions (CASSANDRA-6149) * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) * Fix race conditions in bulk loader (CASSANDRA-6129) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c379343/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
