Updated Branches: refs/heads/trunk 6d364f4a3 -> 58db3ce98
Merge branch 'cassandra-1.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/58db3ce9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58db3ce9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58db3ce9 Branch: refs/heads/trunk Commit: 58db3ce98847a9c5c3118095694cd4f4a15a47f1 Parents: 6d364f4 b1274b8 Author: Brandon Williams <[email protected]> Authored: Mon Feb 4 13:06:54 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Feb 4 13:06:54 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 6 +++++- .../apache/cassandra/service/StorageService.java | 3 +++ 3 files changed, 9 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58db3ce9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7e782c5,e0e8079..94d8be4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -14,8 -7,8 +14,9 @@@ * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694) * allow configuration of internode socket buffer (CASSANDRA-3378) * Make sstable directory picking blacklist-aware again (CASSANDRA-5193) + * Correctly expire gossip states for edge cases (CASSANDRA-5216) + 1.2.1 * stream undelivered hints on decommission (CASSANDRA-5128) * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133) http://git-wip-us.apache.org/repos/asf/cassandra/blob/58db3ce9/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58db3ce9/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
