This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5fe434c4ab44b22a296640dff6f6c3f5431229c6
Merge: d7ffdb2 469c649
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Wed Apr 29 12:03:31 2020 -0500
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
debian/init | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index bc28c28,c495cd6..6d3a3c7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,7 +1,10 @@@
-3.0.21
+3.11.7
+ * Allow sstableloader to use SSL on the native port (CASSANDRA-14904)
+Merged from 3.0:
+ * Fix Debian init start/stop (CASSANDRA-15770)
* Fix infinite loop on index query paging in tables with clustering
(CASSANDRA-14242)
* Fix chunk index overflow due to large sstable with small chunk length
(CASSANDRA-15595)
+ * Allow selecting static column only when querying static index
(CASSANDRA-14242)
* cqlsh return non-zero status when STDIN CQL fails (CASSANDRA-15623)
* Don't skip sstables in slice queries based only on local min/max/deletion
timestamp (CASSANDRA-15690)
* Memtable memory allocations may deadlock (CASSANDRA-15367)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
