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