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 73C08200BF6 for ; Mon, 5 Dec 2016 12:23:23 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 72868160B17; Mon, 5 Dec 2016 11:23:23 +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 B7A62160B21 for ; Mon, 5 Dec 2016 12:23:22 +0100 (CET) Received: (qmail 36606 invoked by uid 500); 5 Dec 2016 11:23:16 -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 36560 invoked by uid 99); 5 Dec 2016 11:23:16 -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, 05 Dec 2016 11:23:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76B7BE9411; Mon, 5 Dec 2016 11:23:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Mon, 05 Dec 2016 11:23:18 -0000 Message-Id: <003a5238b50d4cc7b74015381a396f92@git.apache.org> In-Reply-To: <0b15d1fc37b94aba9a39bc56237a90fd@git.apache.org> References: <0b15d1fc37b94aba9a39bc56237a90fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk archived-at: Mon, 05 Dec 2016 11:23:23 -0000 Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc70e490 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc70e490 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc70e490 Branch: refs/heads/trunk Commit: bc70e49037b17298f9273da3ae23220209c3eeca Parents: 7e66827 afbc2e8 Author: Sam Tunnicliffe Authored: Mon Dec 5 11:21:04 2016 +0000 Committer: Sam Tunnicliffe Committed: Mon Dec 5 11:21:04 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 14e45be,3d27690..f428e31 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +4.0 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + + 3.12 + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) * Add support for arithmetic operators (CASSANDRA-11935) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/src/java/org/apache/cassandra/db/SystemKeyspace.java ----------------------------------------------------------------------