Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4b3d801 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b3d801 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b3d801 Branch: refs/heads/trunk Commit: b4b3d801233f9e9abc84b882c7ae5ed9589b418e Parents: 6c8271f 3d81ac5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jun 12 14:53:57 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jun 12 14:53:57 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b3d801/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
