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 268F4200B48 for ; Mon, 18 Jul 2016 17:43:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 252FA160A8E; Mon, 18 Jul 2016 15:43:24 +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 71875160A89 for ; Mon, 18 Jul 2016 17:43:23 +0200 (CEST) Received: (qmail 76757 invoked by uid 500); 18 Jul 2016 15:43:18 -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 74985 invoked by uid 99); 18 Jul 2016 15:43:17 -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; Mon, 18 Jul 2016 15:43:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48C3DDFBAB; Mon, 18 Jul 2016 15:43:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 18 Jul 2016 15:43:52 -0000 Message-Id: In-Reply-To: <7fee99cfd26d462ca489c3d7c7c85a22@git.apache.org> References: <7fee99cfd26d462ca489c3d7c7c85a22@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/50] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9 archived-at: Mon, 18 Jul 2016 15:43:24 -0000 Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56abaca0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56abaca0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56abaca0 Branch: refs/heads/cassandra-3.8 Commit: 56abaca0466411739895523d0c3a81a7630ab9f0 Parents: 371a147 5861cd8 Author: Aleksey Yeschenko Authored: Mon Jul 11 15:00:33 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Jul 11 15:01:04 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 7 +++---- src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56abaca0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f65b1f4,70210a8..da8216f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,4 +1,9 @@@ -3.0.9 +3.9 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) +Merged from 3.0: - 3.0.9 * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147) * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315) * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)