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/d8d920dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8d920dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8d920dc Branch: refs/heads/trunk Commit: d8d920dce9044a064691ee30ef7de3bd11114cad Parents: caae987 c42f5f6 Author: Tyler Hobbs <[email protected]> Authored: Thu Apr 21 15:32:51 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu Apr 21 15:32:51 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
