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 B7CE3181F7 for ; Fri, 20 Nov 2015 14:21:40 +0000 (UTC) Received: (qmail 23815 invoked by uid 500); 20 Nov 2015 14:21:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 23749 invoked by uid 500); 20 Nov 2015 14:21:40 -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 23646 invoked by uid 99); 20 Nov 2015 14:21:40 -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, 20 Nov 2015 14:21:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2FAECE0991; Fri, 20 Nov 2015 14:21:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Fri, 20 Nov 2015 14:21:42 -0000 Message-Id: <6ab4566221364f22b4cdfc8d9a1d5746@git.apache.org> In-Reply-To: <115c9b4abe0740c48155ff0394770b95@git.apache.org> References: <115c9b4abe0740c48155ff0394770b95@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40161607 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40161607 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40161607 Branch: refs/heads/trunk Commit: 401616076a422f6b9c8280fc6d245f72ce9ba5ac Parents: bc42f32 f3fcdd7 Author: Sylvain Lebresne Authored: Fri Nov 20 15:21:30 2015 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 20 15:21:30 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40161607/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d9adfc2,6c879a4..8b50fc7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ +3.2 + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + 3.1 Merged from 3.0: + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) * Correctly preserve deletion info on updated rows when notifying indexers of single-row deletions (CASSANDRA-10694) * Notify indexers of partition delete during cleanup (CASSANDRA-10685)