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/e27e9741 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e27e9741 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e27e9741 Branch: refs/heads/trunk Commit: e27e974139d371c00c49ad70504f0283caaba356 Parents: ae2daea 4cfb17f Author: Brandon Williams <[email protected]> Authored: Tue Jun 2 08:43:33 2015 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Jun 2 08:43:33 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 16 ------ .../cassandra/service/StorageService.java | 54 +++++++++----------- 3 files changed, 26 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e27e9741/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 474476f,42846d7..4597175 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.0: + * 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) + + 2.2 + * Clean up gossiper logic for old versions (CASSANDRA-9370) * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515) * ant test-all results incomplete when parsed (CASSANDRA-9463) * Disallow frozen<> types in function arguments and return types for http://git-wip-us.apache.org/repos/asf/cassandra/blob/e27e9741/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
