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 CA750200C0E for ; Tue, 27 Dec 2016 19:55:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C72B6160B31; Tue, 27 Dec 2016 18:55:12 +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 1A6DC160B3D for ; Tue, 27 Dec 2016 19:55:11 +0100 (CET) Received: (qmail 29438 invoked by uid 500); 27 Dec 2016 18:55: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 29144 invoked by uid 99); 27 Dec 2016 18:55:11 -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; Tue, 27 Dec 2016 18:55:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6A1DDFCC5; Tue, 27 Dec 2016 18:55:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dikang@apache.org To: commits@cassandra.apache.org Date: Tue, 27 Dec 2016 18:55:12 -0000 Message-Id: <5d8294bfce50434fab41c5f468c2c6ea@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk archived-at: Tue, 27 Dec 2016 18:55:13 -0000 Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: More fixes to the TokenAllocation Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b7126a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b7126a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b7126a Branch: refs/heads/trunk Commit: 88b7126a177a77e28b34384e7792d4b4394cb55f Parents: 55fe548 4aa09eb Author: Dikang Gu Authored: Tue Dec 27 10:51:58 2016 -0800 Committer: Dikang Gu Committed: Tue Dec 27 10:53:05 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../dht/tokenallocator/TokenAllocation.java | 30 ++++++++++++ .../tokenallocator/TokenAllocatorFactory.java | 2 +- src/java/org/apache/cassandra/gms/Gossiper.java | 45 ++++++++++++++++++ .../cassandra/service/CassandraDaemon.java | 48 +------------------- 5 files changed, 78 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b412f11,e9dc503..ba0e3f1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +4.0 + * Thrift removal (CASSANDRA-11115) + * 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 + * More fixes to the TokenAllocator (CASSANDRA-12990) * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) * Allow IN restrictions on column families with collections (CASSANDRA-12654) * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b7126a/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------