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/a8014bb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8014bb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8014bb7 Branch: refs/heads/cassandra-3.0 Commit: a8014bb7ec401d2517e0333c93dd6abb68479c4a Parents: 4b47d71 b154622 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Oct 29 10:39:05 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Oct 29 10:39:05 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
