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/d86e1dd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d86e1dd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d86e1dd6 Branch: refs/heads/trunk Commit: d86e1dd61df7475501e3ab41bdb9a79002fa2ebc Parents: 7822733 9c98818 Author: Brandon Williams <[email protected]> Authored: Wed Jan 22 13:42:39 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Jan 22 13:42:39 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/gms/FailureDetector.java | 30 ++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d86e1dd6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d86e1dd6/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
