Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/131e097a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/131e097a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/131e097a Branch: refs/heads/trunk Commit: 131e097a7e6c334ba31911510dee6c073c9f769b Parents: d22703b a54589e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Sep 15 16:11:14 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Sep 15 16:11:14 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
