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/09/16 16:45:21 UTC
[06/15] 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/a7282e4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7282e4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7282e4d
Branch: refs/heads/trunk
Commit: a7282e4dc3be81bfdc02970d9b59db5002092ed9
Parents: 588dc06 ae4cd69
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 09:44:31 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 09:44:31 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/FailureDetector.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7282e4d/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------