You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/21 03:58:13 UTC
[8/9] git commit: Merge branch 'cassandra-2.0' into trunk
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/ac3afd3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac3afd3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac3afd3b
Branch: refs/heads/trunk
Commit: ac3afd3bc45481330eb3d57329512f7a593ecf19
Parents: 10a2089 ed8117f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Nov 20 20:57:36 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Nov 20 20:57:36 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/gms/FailureDetector.java | 41 +++++++++++++-------
.../cassandra/utils/BoundedStatsDeque.java | 2 +-
.../apache/cassandra/gms/ArrivalWindowTest.java | 9 ++---
4 files changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afd3b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac3afd3b/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------