Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eaef3f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eaef3f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eaef3f9 Branch: refs/heads/trunk Commit: 1eaef3f9edb1043319e7a06f6c77afb3c41ecd42 Parents: e1dda71 ed45d5e Author: Jeff Jirsa <j...@jeffjirsa.net> Authored: Sat Feb 11 23:30:05 2017 -0800 Committer: Jeff Jirsa <j...@jeffjirsa.net> Committed: Sat Feb 11 23:30:31 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../DecayingEstimatedHistogramReservoir.java | 3 +- ...DecayingEstimatedHistogramReservoirTest.java | 31 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eaef3f9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6c1b9b6,5be6cef..7c38295 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -49,13 -18,12 +49,14 @@@ Merged from 3.0 * Provide user workaround when system_schema.columns does not contain entries for a table that's in system_schema.tables (CASSANDRA-13180) Merged from 2.2: - * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) + * Fix negative mean latency metric (CASSANDRA-12876) + * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) Merged from 2.1: * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204) + * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) * Coalescing strategy can enter infinite loop (CASSANDRA-13159) + 3.10 * Fix secondary index queries regression (CASSANDRA-13013) * Add duration type to the protocol V5 (CASSANDRA-12850) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eaef3f9/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java ----------------------------------------------------------------------
