Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79bf03d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79bf03d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79bf03d4 Branch: refs/heads/cassandra-3.1 Commit: 79bf03d4e3af93b8bef5b2acceedd3da05203fcb Parents: 464f8f0 bfbcca1 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 13 09:17:51 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:17:51 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/79bf03d4/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
