Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fff069a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fff069a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fff069a Branch: refs/heads/cassandra-3.8 Commit: 1fff069ad90b33dcda6d231ca5e327758f844388 Parents: c3e636c 2691c9e Author: T Jake Luciani <j...@apache.org> Authored: Wed Aug 10 14:43:13 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Aug 10 14:43:13 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/1fff069a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fff069a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java ----------------------------------------------------------------------
