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/61557c02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61557c02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61557c02 Branch: refs/heads/trunk Commit: 61557c02aeb675a179df7ef3fb3fa7f671bf9b65 Parents: 426109c a7282e4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Sep 16 09:44:44 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Sep 16 09:44:44 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61557c02/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
