Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f467c852 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f467c852 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f467c852 Branch: refs/heads/trunk Commit: f467c8523d7dfc315d246689eec82abaef81d070 Parents: 10649b1 1fff069 Author: T Jake Luciani <j...@apache.org> Authored: Wed Aug 10 14:43:37 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Aug 10 14:43:37 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../metrics/CassandraMetricsRegistry.java | 4 +- .../cassandra/metrics/ClearableHistogram.java | 4 +- .../DecayingEstimatedHistogramReservoir.java | 549 +++++++++++++++++++ .../metrics/EstimatedHistogramReservoir.java | 111 ---- .../cassandra/utils/EstimatedHistogram.java | 2 +- ...DecayingEstimatedHistogramReservoirTest.java | 381 +++++++++++++ 7 files changed, 938 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f467c852/CHANGES.txt ----------------------------------------------------------------------
