Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: NullPointerException during compaction on table with static columns
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21c92cab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21c92cab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21c92cab Branch: refs/heads/trunk Commit: 21c92cab872d9dcbc2722c73555c9dddc4c30ece Parents: 5e319bb b66e5a1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Aug 5 15:03:07 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Aug 5 15:03:07 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bcfbdc9,046c8b3..289f370 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ -3.0.9 +3.9 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * 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: + * NullPointerException during compaction on table with static columns (CASSANDRA-12336) * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) * Fix upgrade of super columns on thrift (CASSANDRA-12335) * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java ----------------------------------------------------------------------
