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 <sylv...@datastax.com> Authored: Wed Aug 3 17:29:22 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> 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 ----------------------------------------------------------------------
