Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d81ac5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d81ac5e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d81ac5e Branch: refs/heads/cassandra-2.0 Commit: 3d81ac5ecd019704b687a829e6ed90c3d05326e6 Parents: daf6f68 d509fe1 Author: Brandon Williams <[email protected]> Authored: Thu Jun 12 14:53:47 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Jun 12 14:53:47 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/3d81ac5e/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
