Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72ab4b94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72ab4b94 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72ab4b94 Branch: refs/heads/trunk Commit: 72ab4b944f915761d8b1bfd22ff75200499e6718 Parents: 075ff50 8b021db Author: Jason Brown <[email protected]> Authored: Wed Jun 17 14:39:43 2015 -0700 Committer: Jason Brown <[email protected]> Committed: Wed Jun 17 14:39:43 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/gms/FailureDetector.java | 59 +++++++++++++++-- .../cassandra/utils/BoundedStatsDeque.java | 68 -------------------- .../gms/ArrayBackedBoundedStatsTest.java | 57 ++++++++++++++++ .../cassandra/utils/BoundedStatsDequeTest.java | 66 ------------------- 5 files changed, 111 insertions(+), 140 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/72ab4b94/CHANGES.txt ----------------------------------------------------------------------
