You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by br...@apache.org on 2015/01/06 16:31:28 UTC

[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffb7f649
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffb7f649
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffb7f649

Branch: refs/heads/trunk
Commit: ffb7f6491d905cd2edaba3a710a1c0bb1f1bf797
Parents: 0f024a6 136042e
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:31:16 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:31:16 2015 -0600

----------------------------------------------------------------------
 .../apache/cassandra/gms/FailureDetector.java   |  8 +++----
 .../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffb7f649/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------