Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 868F2200C26 for ; Sat, 11 Feb 2017 00:32:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 851EB160B70; Fri, 10 Feb 2017 23:32:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0B74E160B6C for ; Sat, 11 Feb 2017 00:32:08 +0100 (CET) Received: (qmail 878 invoked by uid 500); 10 Feb 2017 23:32:06 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 504 invoked by uid 99); 10 Feb 2017 23:32:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2017 23:32:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5BE54F17CD; Fri, 10 Feb 2017 23:32:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jjirsa@apache.org To: commits@cassandra.apache.org Date: Fri, 10 Feb 2017 23:32:19 -0000 Message-Id: <888dac8ecdea4994bdda7d8a5c17a652@git.apache.org> In-Reply-To: <3d359fb5fecc4afba73ad83e04bdd6b0@git.apache.org> References: <3d359fb5fecc4afba73ad83e04bdd6b0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/15] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Fri, 10 Feb 2017 23:32:09 -0000 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 Authored: Fri Feb 10 15:28:39 2017 -0800 Committer: Jeff Jirsa 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)