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 8E1FF188D7 for ; Tue, 12 Jan 2016 17:32:05 +0000 (UTC) Received: (qmail 857 invoked by uid 500); 12 Jan 2016 17:32:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 756 invoked by uid 500); 12 Jan 2016 17:32:04 -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 99849 invoked by uid 99); 12 Jan 2016 17:32:03 -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; Tue, 12 Jan 2016 17:32:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50541E185F; Tue, 12 Jan 2016 17:32:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: carl@apache.org To: commits@cassandra.apache.org Date: Tue, 12 Jan 2016 17:32:20 -0000 Message-Id: <6f5db6e5191644ea8b2d6e1af2e126c6@git.apache.org> In-Reply-To: <9bec52e655174339b78c45fedf90b9ec@git.apache.org> References: <9bec52e655174339b78c45fedf90b9ec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/19] cassandra git commit: Merge branch 'cassandra-3.3' into trunk Merge branch 'cassandra-3.3' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22a1bbb1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22a1bbb1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22a1bbb1 Branch: refs/heads/trunk Commit: 22a1bbb108ac638613c7a3381840a092acfe123e Parents: 1ae3115 91d7bed Author: Carl Yeksigian Authored: Tue Jan 12 12:30:50 2016 -0500 Committer: Carl Yeksigian Committed: Tue Jan 12 12:30:50 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 20 ++++++++++++-------- .../io/sstable/format/SSTableReader.java | 10 +++++++++- 2 files changed, 21 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/22a1bbb1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 41d06cc,a301b0f..e03b6a1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -11,8 -5,19 +11,20 @@@ Merged from 3.0 tombstone (CASSANDRA-10743) * MV should use the maximum timestamp of the primary key (CASSANDRA-10910) * Fix potential assertion error during compaction (CASSANDRA-10944) + Merged from 2.2: + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) + * Enable GC logging by default (CASSANDRA-10140) + * Optimize pending range computation (CASSANDRA-9258) + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) + * drop/alter user should be case sensitive (CASSANDRA-10817) + Merged from 2.1: + * If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676) + * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072) + * Fix pending range calculation during moves (CASSANDRA-10887) + * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-8708) + + 3.2 * Make sure tokens don't exist in several data directories (CASSANDRA-6696) * Add requireAuthorization method to IAuthorizer (CASSANDRA-10852)