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 74277200BBA for ; Sat, 22 Oct 2016 04:09:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 72E3E160AE9; Sat, 22 Oct 2016 02:09:00 +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 B900D160B01 for ; Sat, 22 Oct 2016 04:08:59 +0200 (CEST) Received: (qmail 53641 invoked by uid 500); 22 Oct 2016 02:08:58 -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 53224 invoked by uid 99); 22 Oct 2016 02:08:57 -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; Sat, 22 Oct 2016 02:08:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8620CE098A; Sat, 22 Oct 2016 02:08:57 +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: Sat, 22 Oct 2016 02:09:02 -0000 Message-Id: <25a1ec63261a461eb4c2fba58b118239@git.apache.org> In-Reply-To: <34f1f2fe85f04988b423f5ae116b30fb@git.apache.org> References: <34f1f2fe85f04988b423f5ae116b30fb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Sat, 22 Oct 2016 02:09:00 -0000 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5883e435 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5883e435 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5883e435 Branch: refs/heads/cassandra-3.0 Commit: 5883e43587a110fa21adc5e883aa62c5e3780924 Parents: 7976d65 2871377 Author: Jeff Jirsa Authored: Fri Oct 21 19:02:58 2016 -0700 Committer: Jeff Jirsa Committed: Fri Oct 21 19:03:44 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f14eb22,8b61da4..46f27a6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -30,12 -5,10 +30,13 @@@ Merged from 2.2 * Fix merkle tree depth calculation (CASSANDRA-12580) * Make Collections deserialization more robust (CASSANDRA-12618) * Better handle invalid system roles table (CASSANDRA-12700) + * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) + * Fix authentication problem when invoking cqlsh copy from a SOURCE command (CASSANDRA-12642) + * Decrement pending range calculator jobs counter in finally block + (CASSANDRA-12554) + * Split consistent range movement flag correction (CASSANDRA-12786) Merged from 2.1: -======= -2.1.17 + * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------