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 7AB2818C52 for ; Tue, 9 Feb 2016 06:20:41 +0000 (UTC) Received: (qmail 62165 invoked by uid 500); 9 Feb 2016 06:20:41 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62079 invoked by uid 500); 9 Feb 2016 06:20:41 -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 61784 invoked by uid 99); 9 Feb 2016 06:20:40 -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, 09 Feb 2016 06:20:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B19BAE56E6; Tue, 9 Feb 2016 06:20:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Tue, 09 Feb 2016 06:20:44 -0000 Message-Id: <9e81ea7b32394250a92b1840939b1850@git.apache.org> In-Reply-To: <10d4d4568cf2428e9168c2d0790b790d@git.apache.org> References: <10d4d4568cf2428e9168c2d0790b790d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/14] cassandra git commit: fix CHANGES.txt after 2.1.13 release fix CHANGES.txt after 2.1.13 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/725b9b1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/725b9b1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/725b9b1f Branch: refs/heads/trunk Commit: 725b9b1f7f16ff8ad8e77ad0f7679d39bc7f05b2 Parents: b8408f0 Author: Marcus Eriksson Authored: Tue Feb 9 07:09:54 2016 +0100 Committer: Marcus Eriksson Committed: Tue Feb 9 07:09:54 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/725b9b1f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e5d6ff1..72b3d59 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,11 +1,11 @@ 2.1.14 * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041) * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) + * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) + * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938) 2.1.13 - * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) - * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938) * Fix isJoined return true only after becoming cluster member (CASANDRA-11007) * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969) * Avoid NPE when incremental repair fails (CASSANDRA-10909)