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/690dac3c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/690dac3c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/690dac3c Branch: refs/heads/trunk Commit: 690dac3c2bf6b583d75055124bf2a4d6deb0d564 Parents: dccc91d fe56518 Author: Brandon Williams <[email protected]> Authored: Tue Oct 8 05:28:04 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Oct 8 05:28:04 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/690dac3c/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
