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 D4FB2180D6 for ; Tue, 5 Jan 2016 14:28:57 +0000 (UTC) Received: (qmail 95859 invoked by uid 500); 5 Jan 2016 14:28:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95801 invoked by uid 500); 5 Jan 2016 14:28:56 -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 95037 invoked by uid 99); 5 Jan 2016 14:28:55 -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, 05 Jan 2016 14:28:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBD48E0AF1; Tue, 5 Jan 2016 14:28:55 +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: Tue, 05 Jan 2016 14:29:09 -0000 Message-Id: <2c4d31d3cb3841709a981d3bfb0e4864@git.apache.org> In-Reply-To: <24e2a81550224177b06d26123412962f@git.apache.org> References: <24e2a81550224177b06d26123412962f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/20] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4e3f084 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4e3f084 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4e3f084 Branch: refs/heads/trunk Commit: a4e3f08471fa21ff419c04140a59e95dbad032f3 Parents: 5ad8010 e0c1b0b Author: Sylvain Lebresne Authored: Tue Jan 5 15:27:12 2016 +0100 Committer: Sylvain Lebresne Committed: Tue Jan 5 15:27:12 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/locator/PendingRangeMaps.java | 209 +++++++++++++++++++ .../test/microbench/PendingRangesBench.java | 89 ++++++++ .../cassandra/locator/PendingRangeMapsTest.java | 78 +++++++ 4 files changed, 377 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4e3f084/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 23edbbf,648200b..4b5610e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -2.2.5 +3.0.3 + * Fix potential assertion error during compaction (CASSANDRA-10944) + * Fix counting of received sstables in streaming (CASSANDRA-10949) + * Implement hints compression (CASSANDRA-9428) + * Fix potential assertion error when reading static columns (CASSANDRA-10903) + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711) + * Avoid building PartitionUpdate in toString (CASSANDRA-10897) + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797) + * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873) + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653) + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837) + * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) +Merged from 2.2: + * 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) * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)