Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51a9285e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51a9285e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51a9285e Branch: refs/heads/trunk Commit: 51a9285e9cd7966a7eb8215583060f684bb53e14 Parents: 1af3c3b 2deb68e Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Jun 22 13:01:57 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Jun 22 13:01:57 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/nodetool/Repair.java | 10 ++++++++++ .../org/apache/cassandra/db/RangeTombstoneTest.java | 12 ++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51a9285e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c631c8d,45727f9..188393f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ +3.0: + * Add nodetool command to replay batchlog (CASSANDRA-9547) + * Make file buffer cache independent of paths being read (CASSANDRA-8897) + * Remove deprecated legacy Hadoop code (CASSANDRA-9353) + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + * Change default garbage collector to G1 (CASSANDRA-7486) + * Populate TokenMetadata early during startup (CASSANDRA-9317) + * undeprecate cache recentHitRate (CASSANDRA-6591) + + 2.2 + * Don't repair system_distributed by default (CASSANDRA-9621) * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622) * Rename class for DATE type in Java driver (CASSANDRA-9563) * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475)
