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/4133c74a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4133c74a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4133c74a Branch: refs/heads/cassandra-3.0 Commit: 4133c74a9cde484ec081d37b9423d0d4eacc333a Parents: 3483418 ac24b88 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Aug 30 22:37:54 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Aug 30 22:37:54 2016 -0400 ---------------------------------------------------------------------- .../metrics/DecayingEstimatedHistogramReservoir.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
