Merge branch 'cassandra-2.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/ea6004e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea6004e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea6004e9 Branch: refs/heads/trunk Commit: ea6004e9a24b89d5195935a1c1fcb65b20bfe624 Parents: 854406f 730d4d4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Apr 15 10:12:06 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Apr 15 10:12:06 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/ea6004e9/src/java/org/apache/cassandra/gms/Gossiper.java ----------------------------------------------------------------------
