Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68b3f6e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68b3f6e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68b3f6e7 Branch: refs/heads/trunk Commit: 68b3f6e71c37e343465884bebcc82c5866ea5b21 Parents: 561b07e a5cbb02 Author: Sylvain Lebresne <[email protected]> Authored: Thu Jul 28 16:34:22 2016 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Jul 28 16:34:22 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../ReplicationAwareTokenAllocatorTest.java | 15 ++++++ test/unit/org/apache/cassandra/Util.java | 56 ++++++++++++++++++++ 3 files changed, 72 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b3f6e7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 109411a,8f6997b..d6a9d16 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.9 +3.9 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) +Merged from 3.0: + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) * Exception when computing read-repair for range tombstones (CASSANDRA-12263) * Lost counter writes in compact table and static columns (CASSANDRA-12219) * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b3f6e7/test/unit/org/apache/cassandra/Util.java ----------------------------------------------------------------------
