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 3FD1D18C41 for ; Fri, 7 Aug 2015 20:35:29 +0000 (UTC) Received: (qmail 43998 invoked by uid 500); 7 Aug 2015 20:35:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 43874 invoked by uid 500); 7 Aug 2015 20:35:29 -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 43838 invoked by uid 99); 7 Aug 2015 20:35:28 -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; Fri, 07 Aug 2015 20:35:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2D90E0F79; Fri, 7 Aug 2015 20:35:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Fri, 07 Aug 2015 20:35:30 -0000 Message-Id: <27ba57771cf947cbb1bcc47083b6daa3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ffeebff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ffeebff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ffeebff Branch: refs/heads/cassandra-3.0 Commit: 8ffeebff631ee0cd7c36ca164bdf5c231832e57c Parents: 5b68b2d 34193ee Author: Tyler Hobbs Authored: Fri Aug 7 15:34:16 2015 -0500 Committer: Tyler Hobbs Committed: Fri Aug 7 15:34:16 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ffeebff/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 98c8d73,c4409c1..0ed63f1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ -2.1.9 +2.2.1 + * Add checksum to saved cache files (CASSANDRA-9265) + * Log warning when using an aggregate without partition key (CASSANDRA-9737) + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900) + * UDF / UDA execution time in trace (CASSANDRA-9723) + * Fix broken internode SSL (CASSANDRA-9884) +Merged from 2.1: + * (cqlsh) Avoid overwriting new config file with old config + when both exist (CASSANDRA-9777) * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998) * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871) * Fix handling of enable/disable autocompaction (CASSANDRA-9899)