Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/042e1f76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/042e1f76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/042e1f76 Branch: refs/heads/trunk Commit: 042e1f76a9955553bb8f14ce31a13bde421ed071 Parents: b603720 52be7ba Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Aug 4 08:50:04 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Thu Aug 4 08:50:04 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 62a6e6f,f0ceb70..31d9434 --- 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: + * 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) * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/src/java/org/apache/cassandra/metrics/TableMetrics.java ----------------------------------------------------------------------
