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/00b6a037 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00b6a037 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00b6a037 Branch: refs/heads/trunk Commit: 00b6a037293bb930f43180fb9e4fc895d70923ed Parents: 2e96779 7316bb3 Author: Dave Brosius <[email protected]> Authored: Mon Apr 28 20:00:51 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Apr 28 20:00:51 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00b6a037/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00b6a037/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------
