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/1ffcdb5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ffcdb5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ffcdb5a Branch: refs/heads/trunk Commit: 1ffcdb5a6fd5d69c8978f3597c4ab8710cdd30ad Parents: 61b3d34 94a8c77 Author: Jason Brown <jasedbr...@gmail.com> Authored: Sat Feb 11 08:03:00 2017 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Sat Feb 11 08:03:31 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/OutboundTcpConnection.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ffcdb5a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d2023cf,b34e5f6..6c1b9b6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -51,10 -20,9 +51,11 @@@ Merged from 3.0 Merged from 2.2: * 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/1ffcdb5a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ----------------------------------------------------------------------
