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 2857F200C1C for ; Wed, 15 Feb 2017 13:54:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 27062160B70; Wed, 15 Feb 2017 12:54: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 71A68160B76 for ; Wed, 15 Feb 2017 13:54:12 +0100 (CET) Received: (qmail 58211 invoked by uid 500); 15 Feb 2017 12:54:10 -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 57823 invoked by uid 99); 15 Feb 2017 12:54: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; Wed, 15 Feb 2017 12:54:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72D61E0C07; Wed, 15 Feb 2017 12:54:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulo@apache.org To: commits@cassandra.apache.org Date: Wed, 15 Feb 2017 12:54:18 -0000 Message-Id: <267271e913274b89acd4b8d7cd0e93e5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [9/9] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Wed, 15 Feb 2017 12:54:13 -0000 Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31eac784 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31eac784 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31eac784 Branch: refs/heads/trunk Commit: 31eac784f1bae9ec3509d7a7726d9b8725764fa0 Parents: a0827fb ef9df6e Author: Paulo Motta Authored: Wed Feb 15 10:53:21 2017 -0200 Committer: Paulo Motta Committed: Wed Feb 15 10:53:21 2017 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 11 ++-- .../cassandra/db/SizeEstimatesRecorder.java | 54 ++++++++++---------- .../cassandra/service/ActiveRepairService.java | 5 +- 4 files changed, 40 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6016674,ee5a5cb..6efcaa3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -37,8 -7,8 +37,9 @@@ * More fixes to the TokenAllocator (CASSANDRA-12990) * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) Merged from 3.0: + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Obfuscate password in stress-graphs (CASSANDRA-12233) * Hint related logging should include the IP address of the destination in addition to host ID (CASSANDRA-13205) * Reloading logback.xml does not work (CASSANDRA-13173) http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 9c183f6,fc27526..d936dbe --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,40 -13,15 +13,45 @@@ 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 +------------ + - Support for arithmetic operations between `timestamp`/`date` and `duration` has been added. + See CASSANDRA-11936 + - Support for arithmetic operations on number has been added. See CASSANDRA-11935 + - 3.11 - ==== - +Upgrading +--------- + - Cassandra 4.0 removed support for the deprecated Thrift interface. Amongst + Tother things, this imply the removal of all yaml option related to thrift + ('start_rpc', rpc_port, ...). + - Cassandra 4.0 removed support for any pre-3.0 format. This means you + cannot upgrade from a 2.x version to 4.0 directly, you have to upgrade to + a 3.0.x/3.x version first (and run upgradesstable). In particular, this + mean Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you + will need to upgrade those sstable in 3.0.x/3.x first. + - 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. + - Cassandra 4.0 fixes a problem with incremental repair which caused repaired + data to be inconsistent between nodes. The fix changes the behavior of both + full and incremental repairs. For full repairs, data is no longer marked + repaired. For incremental repairs, anticompaction is run at the beginning + of the repair, instead of at the end. + 3.11.0 + ====== + + Upgrading + --------- + - Primary ranges in the system.size_estimates table are now based on the keyspace + replication settings and adjacent ranges are no longer merged (CASSANDRA-9639). + 3.10 ==== http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31eac784/src/java/org/apache/cassandra/service/ActiveRepairService.java ----------------------------------------------------------------------