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 4EE8D200C38 for ; Wed, 1 Mar 2017 00:12:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4D7A3160B7E; Tue, 28 Feb 2017 23:12:46 +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 9F7E3160B80 for ; Wed, 1 Mar 2017 00:12:45 +0100 (CET) Received: (qmail 62650 invoked by uid 500); 28 Feb 2017 23:12:44 -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 62239 invoked by uid 99); 28 Feb 2017 23:12:44 -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, 28 Feb 2017 23:12:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 506E8DFF47; Tue, 28 Feb 2017 23:12:44 +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, 28 Feb 2017 23:12:46 -0000 Message-Id: <846400d9f70848948902e471b535b6bc@git.apache.org> In-Reply-To: <1092206aee1e400f978f8fb405d974bd@git.apache.org> References: <1092206aee1e400f978f8fb405d974bd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/10] cassandra git commit: Fix CHANGES.txt versions for CASSANDRA-13090. archived-at: Tue, 28 Feb 2017 23:12:46 -0000 Fix CHANGES.txt versions for CASSANDRA-13090. Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3748bf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3748bf7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3748bf7c Branch: refs/heads/cassandra-3.11 Commit: 3748bf7c2a135baab33ccd3b79db5f3fb9132995 Parents: dffb1a6 Author: Ariel Weisberg Authored: Tue Feb 28 17:56:24 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:56:24 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3748bf7c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b565acb..e7e0367 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.10 + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) @@ -8,7 +9,6 @@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) 2.2.9 - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)