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 CFA49200CC8 for ; Thu, 29 Jun 2017 22:13:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CE579160BFF; Thu, 29 Jun 2017 20:13:45 +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 276EE160BED for ; Thu, 29 Jun 2017 22:13:45 +0200 (CEST) Received: (qmail 53323 invoked by uid 500); 29 Jun 2017 20:13:44 -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 53112 invoked by uid 99); 29 Jun 2017 20:13:44 -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; Thu, 29 Jun 2017 20:13:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 421D8DF97C; Thu, 29 Jun 2017 20:13:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aweisberg@apache.org To: commits@cassandra.apache.org Date: Thu, 29 Jun 2017 20:13:47 -0000 Message-Id: <5d514ea6953a4994a605d29d741e6a31@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Thu, 29 Jun 2017 20:13:46 -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/fe3cfe3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe3cfe3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe3cfe3d Branch: refs/heads/trunk Commit: fe3cfe3d7df296f022c50c9c0d22f91a0fc0a217 Parents: 20d5ce8 7afb97c Author: Ariel Weisberg Authored: Thu Jun 29 16:12:35 2017 -0400 Committer: Ariel Weisberg Committed: Thu Jun 29 16:12:35 2017 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe3cfe3d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 211769c,096dfa4..e56eb78 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -85,8 -1,9 +85,9 @@@ 3.11.1 * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) Merged from 3.0: - * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) - * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) ++ * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) + * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) 3.11.0 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org