Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfbcca1b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfbcca1b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfbcca1b Branch: refs/heads/cassandra-3.1 Commit: bfbcca1bf536e4d3eff0ad438e8c3221dc2485d8 Parents: b05fe4f 582b66f Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 13 09:17:40 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:17:40 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/bfbcca1b/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
