Merge branch 'cassandra-3.11' into trunk

CHANGES.txt

@@ -6,6 +6,7 @@
  * Add `allocate_tokens_for_local_replication_factor` option for token allocation (CASSANDRA-15260)
  * Add Alibaba Cloud Platform snitch (CASSANDRA-15092)
 Merged from 3.0:
+ * Add ability to cap max negotiable protocol version (CASSANDRA-15193)
  * Gossip tokens on startup if available (CASSANDRA-15335)
  * Fix resource leak in CompressedSequentialWriter (CASSANDRA-15340)
  * Fix bad merge that reverted CASSANDRA-14993 (CASSANDRA-15289)

bin/cqlsh.py

@@ -625,7 +625,7 @@ class Shell(cmd.Cmd):
         result, = self.session.execute("select * from system.local where key = 'local'")
         vers = {
             'build': result['release_version'],
-            'protocol': result['native_protocol_version'],
+            'protocol': self.conn.protocol_version,
             'cql': result['cql_version'],
         }
         self.connection_versions = vers

src/java/org/apache/cassandra/config/Config.java

@@ -191,6 +191,8 @@ public class Config
     public int native_transport_frame_block_size_in_kb = 32;
     public volatile long native_transport_max_concurrent_requests_in_bytes_per_ip = -1L;
     public volatile long native_transport_max_concurrent_requests_in_bytes = -1L;
+    @Deprecated
+    public Integer native_transport_max_negotiable_protocol_version = null;
 
 
     /**

src/java/org/apache/cassandra/config/DatabaseDescriptor.java

@@ -496,6 +496,10 @@ public class DatabaseDescriptor
             throw new ConfigurationException("native_transport_max_frame_size_in_mb must be smaller than 2048, but was "
                     + conf.native_transport_max_frame_size_in_mb, false);
 
+        if (conf.native_transport_max_negotiable_protocol_version != null)
+            logger.warn("The configuration option native_transport_max_negotiable_protocol_version has been deprecated " +
+                        "and should be removed from cassandra.yaml as it has no longer has any effect.");
+
         // if data dirs, commitlog dir, or saved caches dir are set in cassandra.yaml, use that.  Otherwise,
         // use -Dcassandra.storagedir (set in cassandra-env.sh) as the parent dir for data/, commitlog/, and saved_caches/
         if (conf.commitlog_directory == null)