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:28 UTC

[13/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: e8691d77aabd7cf752a6581b59c47ac841f9a1f3
Parents: a3a8dbc 61557c0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 09:44:55 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 09:44:55 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------