Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7BC01200C31 for ; Tue, 21 Feb 2017 20:20:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7A59B160B74; Tue, 21 Feb 2017 19:20:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C7ECB160B77 for ; Tue, 21 Feb 2017 20:20:05 +0100 (CET) Received: (qmail 96637 invoked by uid 500); 21 Feb 2017 19:20: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 96361 invoked by uid 99); 21 Feb 2017 19:20:04 -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, 21 Feb 2017 19:20:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D065E114F; Tue, 21 Feb 2017 19:20:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aweisberg@apache.org To: commits@cassandra.apache.org Date: Tue, 21 Feb 2017 19:20:10 -0000 Message-Id: In-Reply-To: <4cf0340de04749c2945eda45fd048ee9@git.apache.org> References: <4cf0340de04749c2945eda45fd048ee9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Tue, 21 Feb 2017 19:20:06 -0000 Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c382a900 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c382a900 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c382a900 Branch: refs/heads/cassandra-3.11 Commit: c382a900b8059303f5ee1632650bc560e40c7cdf Parents: 87e8c6b 5022264 Author: Ariel Weisberg Authored: Tue Feb 21 12:17:02 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:17:02 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c382a900/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a98e43d,f2419d6..846fc20 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -219,21 -107,6 +219,21 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) ++ * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)