Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4f2354e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4f2354e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4f2354e Branch: refs/heads/trunk Commit: d4f2354e455f00499479e7a801c691d074f3ec86 Parents: cc5128a ea1beda Author: Brandon Williams <[email protected]> Authored: Mon Apr 27 14:38:46 2015 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Apr 27 14:38:46 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../gms/GossipDigestSynVerbHandler.java | 8 ++++++ src/java/org/apache/cassandra/gms/Gossiper.java | 26 ++++++++++++++++++++ 3 files changed, 35 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4f2354e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4f2354e/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4f2354e/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
