Merge branch 'cassandra-3.0' into cassandra-3.11

CHANGES.txt

@@ -1,3 +1,8 @@
+3.11.10
+Merged from 3.0:
+ * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
+ * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
+
 3.11.9
  * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
  * Fix ColumnFilter to avoid querying cells of unselected complex columns (CASSANDRA-15977)
@@ -6,9 +11,6 @@
  * Avoid failing compactions with very large partitions (CASSANDRA-15164)
  * Make sure LCS handles duplicate sstable added/removed notifications correctly (CASSANDRA-14103)
 Merged from 3.0:
-3.0.23:
- * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
- * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
  * Fix OOM when terminating repair session (CASSANDRA-15902)
  * Avoid marking shutting down nodes as up after receiving gossip shutdown message (CASSANDRA-16094)
  * Check SSTables for latest version before dropping compact storage (CASSANDRA-16063)

build.xml

@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="3.11.9"/>
+    <property name="base.version" value="3.11.10"/>
     <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>

debian/changelog

@@ -1,3 +1,9 @@
+cassandra (3.11.10) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Mick Semb Wever <mck@apache.org>  Thu, 29 Oct 2020 12:32:12 +0100
+
 cassandra (3.11.9) unstable; urgency=medium
 
   * New release