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/67909ea8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67909ea8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67909ea8 Branch: refs/heads/cassandra-3.9 Commit: 67909ea84caf296a24a183d3fb86f9131ccef3d0 Parents: 79fbdbe 6105da3 Author: Carl Yeksigian <[email protected]> Authored: Tue Jul 26 09:59:15 2016 -0400 Committer: Carl Yeksigian <[email protected]> Committed: Tue Jul 26 09:59:15 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/AbstractReadExecutor.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67909ea8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2f7d2d3,3c485dd..50f7a6d --- 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: + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) * Add option to override compaction space check (CASSANDRA-12180) * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) * Respond with v1/v2 protocol header when responding to driver that attempts
