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/421c41d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/421c41d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/421c41d5 Branch: refs/heads/trunk Commit: 421c41d576fc1eb94fc5887b684fcff16628641b Parents: 6688911 79bf03d Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 13 09:18:02 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:18:02 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
