Merge branch 'cassandra-3.8' into cassandra-3.9
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa64e65e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa64e65e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa64e65e
Branch: refs/heads/trunk
Commit: aa64e65e1e2f4a749454db578f60560b6d69ae0f
Parents: 5fe02b3 b27e2f9
Author: Dave Brosius <dbros...@mebigfatguy.com>
Authored: Tue Jul 26 20:20:52 2016 -0400
Committer: Dave Brosius <dbros...@mebigfatguy.com>
Committed: Tue Jul 26 20:20:52 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa64e65e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 50f7a6d,4330fde..6bba5b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,3 +1,20 @@@
+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
+ to connect with too low of a protocol version (CASSANDRA-11464)
+ * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
+ * Fix problem with undeleteable rows on upgrade to new sstable format
(CASSANDRA-12144)
+Merged from 2.2:
+ * cqlsh copyutil should get host metadata by connected address
(CASSANDRA-11979)
+ * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
+Merged from 2.1:
+ * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
+
-
3.8
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms
(CASSANDRA-12073)
