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/219ab71f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/219ab71f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/219ab71f Branch: refs/heads/trunk Commit: 219ab71fe036d485779564397fc8a976a9661c36 Parents: cf4f2dd 197d439 Author: Brandon Williams <[email protected]> Authored: Wed Jun 18 15:24:33 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 18 15:24:33 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/219ab71f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/219ab71f/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
