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 7FE94200BB3 for ; Wed, 2 Nov 2016 19:26:34 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7EAA4160B0D; Wed, 2 Nov 2016 18:26:34 +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 CBC0B160B0A for ; Wed, 2 Nov 2016 19:26:33 +0100 (CET) Received: (qmail 81151 invoked by uid 500); 2 Nov 2016 18:24:24 -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 81072 invoked by uid 99); 2 Nov 2016 18:24:24 -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; Wed, 02 Nov 2016 18:24:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA0D0F0C5F; Wed, 2 Nov 2016 18:24:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Wed, 02 Nov 2016 18:24:18 -0000 Message-Id: <530e4761b91f49c694a222b308453554@git.apache.org> In-Reply-To: <5225f9f8aa5c4be9b536a83c5c75f289@git.apache.org> References: <5225f9f8aa5c4be9b536a83c5c75f289@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk archived-at: Wed, 02 Nov 2016 18:26:34 -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/8fcedf54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fcedf54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fcedf54 Branch: refs/heads/trunk Commit: 8fcedf544a7732341dc675804237814184910b14 Parents: 8abb632 d2d7299 Author: Robert Stupp Authored: Wed Nov 2 19:22:23 2016 +0100 Committer: Robert Stupp Committed: Wed Nov 2 19:22:23 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fcedf54/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a1462a6,25facd5..176d34a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +4.0 + * 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.10 + * Don't load MX4J beans twice (CASSANDRA-12869) * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838) * Set JOINING mode when running pre-join tasks (CASSANDRA-12836) * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)