Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d5f6ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d5f6ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d5f6ad Branch: refs/heads/trunk Commit: 82d5f6ad599a5f19771155c5e0f839219bd6da07 Parents: 4ee374a b89037f Author: Joshua McKenzie <jmcken...@apache.org> Authored: Wed Dec 2 11:11:23 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Wed Dec 2 11:11:23 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
