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 D20DD18A07 for ; Wed, 2 Dec 2015 19:52:25 +0000 (UTC) Received: (qmail 77403 invoked by uid 500); 2 Dec 2015 19:52:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 77356 invoked by uid 500); 2 Dec 2015 19:52:25 -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 77100 invoked by uid 99); 2 Dec 2015 19:52:25 -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; Wed, 02 Dec 2015 19:52:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1FAE2E60D4; Wed, 2 Dec 2015 19:52:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Wed, 02 Dec 2015 19:52:30 -0000 Message-Id: <96044e68ee5540a4b7ed5f857d07f497@git.apache.org> In-Reply-To: <18058439c7934d60b1c78487c3a1baec@git.apache.org> References: <18058439c7934d60b1c78487c3a1baec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/461fffc7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/461fffc7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/461fffc7 Branch: refs/heads/trunk Commit: 461fffc764c1a2363b92ba3084fca8543440b0ae Parents: b524020 62de5a3 Author: Yuki Morishita Authored: Wed Dec 2 13:52:08 2015 -0600 Committer: Yuki Morishita Committed: Wed Dec 2 13:52:08 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamReader.java | 4 +--- .../cassandra/streaming/compress/CompressedStreamReader.java | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/461fffc7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cc79512,ad4cd8b..a4c12a2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,6 +1,20 @@@ +3.2 + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * 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 NPE on stream read error (CASSANDRA-10771) * Normalize cqlsh DESC output (CASSANDRA-10431) * Rejects partition range deletions when columns are specified (CASSANDRA-10739) * Fix error when saving cached key for old format sstable (CASSANDRA-10778)