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 7AE491863F for ; Mon, 14 Dec 2015 09:38:22 +0000 (UTC) Received: (qmail 40152 invoked by uid 500); 14 Dec 2015 09:38:22 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 40080 invoked by uid 500); 14 Dec 2015 09:38:22 -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 39939 invoked by uid 99); 14 Dec 2015 09:38:22 -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; Mon, 14 Dec 2015 09:38:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F3D0DDFF93; Mon, 14 Dec 2015 09:38:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Mon, 14 Dec 2015 09:38:24 -0000 Message-Id: <85ca51a47b0e415f856cdda74d846d7f@git.apache.org> In-Reply-To: <2d8a46dbc9e249ad81a0a30af99ddc23@git.apache.org> References: <2d8a46dbc9e249ad81a0a30af99ddc23@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bfe6135 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bfe6135 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bfe6135 Branch: refs/heads/trunk Commit: 9bfe613579d3febda4e0c448a012c0e78a4d277b Parents: a808769 94e8d62 Author: Benjamin Lerer Authored: Mon Dec 14 10:37:27 2015 +0100 Committer: Benjamin Lerer Committed: Mon Dec 14 10:37:39 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/stress/generate/values/Generator.java | 4 ++-- .../apache/cassandra/stress/generate/values/Lists.java | 13 +++++++------ .../apache/cassandra/stress/generate/values/Sets.java | 10 +++++----- 4 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bfe6135/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 10b6226,c30d35d..0ca5277 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,12 +1,24 @@@ -3.0.2 -Merged from 2.2 +3.2 + * Group pending compactions based on table (CASSANDRA-10718) + * Add compressor name in sstablemetadata output (CASSANDRA-9879) + * Fix type casting for counter columns (CASSANDRA-10824) + * Prevent running Cassandra as root (CASSANDRA-8142) + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639) + * 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) +Merged from 2.2: * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * Make Stress compiles within eclipse (CASSANDRA-10807) * Cassandra Daemon should print JVM arguments (CASSANDRA-10764) * Allow cancellation of index summary redistribution (CASSANDRA-8805)