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/3b275339 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b275339 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b275339 Branch: refs/heads/trunk Commit: 3b2753391f154d87e8c5d5e17c34afa35d68598c Parents: 1effb10 b221e8e Author: Jeff Jirsa <j...@jeffjirsa.net> Authored: Fri Feb 10 15:28:39 2017 -0800 Committer: Jeff Jirsa <j...@jeffjirsa.net> Committed: Fri Feb 10 15:31:07 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/CoalescingStrategies.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b275339/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8565c9b,aaad3e7..fc5be8d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -48,9 -17,8 +48,10 @@@ Merged from 3.0 Merged from 2.2: * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) Merged from 2.1: + * 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)