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 9387B200BDB for ; Mon, 12 Dec 2016 15:25:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 922F8160B0D; Mon, 12 Dec 2016 14:25:29 +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 DCEC4160B2A for ; Mon, 12 Dec 2016 15:25:28 +0100 (CET) Received: (qmail 20040 invoked by uid 500); 12 Dec 2016 14:25:27 -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 19872 invoked by uid 99); 12 Dec 2016 14:25:27 -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, 12 Dec 2016 14:25:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B9967E076F; Mon, 12 Dec 2016 14:25:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Date: Mon, 12 Dec 2016 14:25:29 -0000 Message-Id: <057efd4cb53e4b9ab5bc9e3f0fddc4ce@git.apache.org> In-Reply-To: <6b81d3e45226497491882713d7a8d888@git.apache.org> References: <6b81d3e45226497491882713d7a8d888@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, 12 Dec 2016 14:25:29 -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/9c0fa054 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c0fa054 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c0fa054 Branch: refs/heads/trunk Commit: 9c0fa054a2cc2bfb470f6d6547ae0701dd32528f Parents: 31501cc c0e7110 Author: Jason Brown Authored: Mon Dec 12 06:23:22 2016 -0800 Committer: Jason Brown Committed: Mon Dec 12 06:24:52 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/stress/settings/SettingsCommand.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c0fa054/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fa2bf93,c4f4c1f..6e57ea7 --- 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 + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) * Add mutation size and batch metrics (CASSANDRA-12649) * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) * Fix primary index calculation for SASI (CASSANDRA-12910)