You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2016/09/30 03:08:13 UTC
[4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
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 <je...@crowdstrike.com>
Authored: Thu Sep 29 20:02:31 2016 -0700
Committer: Jeff Jirsa <je...@crowdstrike.com>
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
====