Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7349ec2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7349ec2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7349ec2a Branch: refs/heads/trunk Commit: 7349ec2aa327bb0fabb7702003308dae5fd4d6c1 Parents: 8fb393e b4b3d80 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jun 12 14:54:05 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jun 12 14:54:05 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7349ec2a/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
