Merge branch 'cassandra-2.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/cfac7fbc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfac7fbc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfac7fbc Branch: refs/heads/trunk Commit: cfac7fbc1a649469fd8a2be539715e473b871f7b Parents: 3f918e2 690dac3 Author: Brandon Williams <[email protected]> Authored: Tue Oct 8 05:28:13 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Oct 8 05:28:13 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/gms/FailureDetector.java | 22 ++++++++++++++++++++ .../cassandra/gms/FailureDetectorMBean.java | 4 ++++ 2 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfac7fbc/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
