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:26 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/136042ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136042ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/136042ec
Branch: refs/heads/trunk
Commit: 136042ec3985bbacfcf55333ef5668779d2744fe
Parents: e83304d eb9c5bb
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:31:05 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:31:05 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/136042ec/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------