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/cd0cbd3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd0cbd3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd0cbd3b Branch: refs/heads/trunk Commit: cd0cbd3b1ed3f1779e50a79f6b33af1e9a8f41a1 Parents: 4698b8f 9adb31c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jun 9 14:18:31 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jun 9 14:18:31 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../gms/GossipDigestAckVerbHandler.java | 1 - .../gms/GossipDigestSynVerbHandler.java | 1 - src/java/org/apache/cassandra/gms/Gossiper.java | 25 ++++++++++++-------- 4 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd0cbd3b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd0cbd3b/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd0cbd3b/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
