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 3703C200BA0 for ; Fri, 30 Sep 2016 05:08:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 35B52160AE3; Fri, 30 Sep 2016 03:08:13 +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 73D06160AE9 for ; Fri, 30 Sep 2016 05:08:12 +0200 (CEST) Received: (qmail 60764 invoked by uid 500); 30 Sep 2016 03:08:11 -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 60174 invoked by uid 99); 30 Sep 2016 03:08:10 -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; Fri, 30 Sep 2016 03:08:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6BD29E0AD9; Fri, 30 Sep 2016 03:08:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jjirsa@apache.org To: commits@cassandra.apache.org Date: Fri, 30 Sep 2016 03:08:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk archived-at: Fri, 30 Sep 2016 03:08:13 -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/a052dbfe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a052dbfe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a052dbfe Branch: refs/heads/trunk Commit: a052dbfe6fe6d513f3898216ee42325e6ca5e8a4 Parents: 87825f8 0240411 Author: Jeff Jirsa Authored: Thu Sep 29 20:02:31 2016 -0700 Committer: Jeff Jirsa Committed: Thu Sep 29 20:05:38 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- NEWS.txt | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a052dbfe/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 727ad64,ca95411..4472411 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,3 +1,6 @@@ +4.0 - ++ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + 3.10 * cdc column addition still breaks schema migration tasks (CASSANDRA-12697) * Upgrade metrics-reporter dependencies (CASSANDRA-12089) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a052dbfe/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index e1e952b,ad0f2be..9db425a --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,16 -13,6 +13,19 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +4.0 +=== + +New features +------------ + +Upgrading +--------- - ++ - Cassandra will no longer allow invalid keyspace replication options, such as invalid datacenter names for ++ NetworkTopologyStrategy. Operators MUST add new nodes to a datacenter before they can set set ALTER or ++ CREATE keyspace replication policies using that datacenter. Existing keyspaces will continue to operate, ++ but CREATE and ALTER will validate that all datacenters specified exist in the cluster. + 3.10 ====