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

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

Merge branch 'cassandra-3.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/4878f696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4878f696
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4878f696

Branch: refs/heads/trunk
Commit: 4878f696eace85077b32c91937a1fe092bffd8fb
Parents: 43ddec3 e8691d7
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 09:45:05 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 09:45:05 2015 -0500

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