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