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 3C32E200B7C for ; Wed, 3 Aug 2016 17:30:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3B08D160A5D; Wed, 3 Aug 2016 15:30:01 +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 6E96F160AAA for ; Wed, 3 Aug 2016 17:30:00 +0200 (CEST) Received: (qmail 44039 invoked by uid 500); 3 Aug 2016 15:29:59 -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 43623 invoked by uid 99); 3 Aug 2016 15:29:59 -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; Wed, 03 Aug 2016 15:29:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0667BEE68D; Wed, 3 Aug 2016 15:29:59 +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: Wed, 03 Aug 2016 15:30:02 -0000 Message-Id: In-Reply-To: <7472395396b242d284e2c7a1f7cf9419@git.apache.org> References: <7472395396b242d284e2c7a1f7cf9419@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9 archived-at: Wed, 03 Aug 2016 15:30:01 -0000 Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Super columns are broken after upgrading to 3.0 on thrift Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1323ad0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1323ad0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1323ad0f Branch: refs/heads/cassandra-3.9 Commit: 1323ad0fba0063b646eb0be5843956dd345159a4 Parents: 717c6d6 3431934 Author: Sylvain Lebresne Authored: Wed Aug 3 17:29:22 2016 +0200 Committer: Sylvain Lebresne Committed: Wed Aug 3 17:29:22 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1323ad0f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bb58e77,e8b8abb..0d79a9f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.9 +3.9 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) +Merged from 3.0: + * Fix upgrade of super columns on thrift (CASSANDRA-12335) * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) * Exception when computing read-repair for range tombstones (CASSANDRA-12263) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1323ad0f/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java ----------------------------------------------------------------------