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/3b126fd5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b126fd5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b126fd5 Branch: refs/heads/cassandra-3.0 Commit: 3b126fd5aff1cda9b6b0d6d2968a8103fc09d905 Parents: cd4a1e6 7fba3d2 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Sep 15 16:10:47 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Sep 15 16:10:47 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b126fd5/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
