Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31f67c28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31f67c28 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31f67c28 Branch: refs/heads/trunk Commit: 31f67c2898a9d4b310de513737f703dc2514b84c Parents: c9d209b 17e79b7 Author: T Jake Luciani <[email protected]> Authored: Thu Jan 7 12:43:13 2016 -0500 Committer: T Jake Luciani <[email protected]> Committed: Thu Jan 7 12:43:13 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +++++ .../apache/cassandra/metrics/EstimatedHistogramReservoir.java | 5 +++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31f67c28/CHANGES.txt ----------------------------------------------------------------------
