Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D970E18378 for ; Sun, 13 Sep 2015 09:38:12 +0000 (UTC) Received: (qmail 10320 invoked by uid 500); 13 Sep 2015 09:38:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 10224 invoked by uid 500); 13 Sep 2015 09:38: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 9815 invoked by uid 99); 13 Sep 2015 09:38: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; Sun, 13 Sep 2015 09:38:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59519E0B2F; Sun, 13 Sep 2015 09:38:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Sun, 13 Sep 2015 09:38:17 -0000 Message-Id: <66eeb27b4b9f4d6db0ef4fa2d6278333@git.apache.org> In-Reply-To: <690e6ea58fc14217a842c3389c5bd70f@git.apache.org> References: <690e6ea58fc14217a842c3389c5bd70f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97917960 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97917960 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97917960 Branch: refs/heads/trunk Commit: 9791796096cc2f61444169721bbc0ca03d9509e5 Parents: 53d0449 ae51086 Author: Robert Stupp Authored: Sun Sep 13 11:34:31 2015 +0200 Committer: Robert Stupp Committed: Sun Sep 13 11:34:31 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/cqlhandling.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ffae4d9,dff47fc..bd24781 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,7 +1,17 @@@ -2.1.10 +2.2.2 + * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) + * Cancel transaction for sstables we wont redistribute index summary + for (CASSANDRA-10270) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) + * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) + * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) + * Fix repair hang when snapshot failed (CASSANDRA-10057) + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks + (CASSANDRA-10199) +Merged from 2.1: + * BATCH statement is broken in cqlsh (CASSANDRA-10272) * Added configurable warning threshold for GC duration (CASSANDRA-8907) - * (cqlsh) Make cqlsh PEP8 compliant (CASSANDRA-10066) + * (cqlsh) Make cqlsh PEP8 Compliant (CASSANDRA-10066) * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282) * Scrub, Cleanup and Upgrade do not unmark compacting until all operations have completed, regardless of the occurence of exceptions (CASSANDRA-10274) http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/pylib/cqlshlib/cqlhandling.py ----------------------------------------------------------------------