Change trunk from 5.1 to 6.0

 patch by Mick Semb Wever; reviewed by Dmitry Konstantinov for CASSANDRA-21243

Author: michaelsembwever

CHANGES.txt

@@ -1,4 +1,4 @@
-5.1
+6.0
  * Improve performance when calculating settled placements during range movements (CASSANDRA-21144)
  * Make shadow gossip round parameters configurable for testing (CASSANDRA-21149)
  * Avoid potential gossip thread deadlock during decommission (CASSANDRA-21143)

NEWS.txt

@@ -75,7 +75,7 @@ restore snapshots created with the previous major version using the
 using the provided 'sstableupgrade' tool.
 
 
-5.1
+6.0
 ===
 
 New features

README.asc

@@ -52,7 +52,7 @@ be sitting in front of a prompt:
 
 ----
 Connected to Test Cluster at localhost:9160.
-[cqlsh 6.3.0 | Cassandra 5.0-SNAPSHOT | CQL spec 3.4.8 | Native protocol v5]
+[cqlsh 6.3.0 | Cassandra 6.0-SNAPSHOT | CQL spec 3.4.8 | Native protocol v5]
 Use HELP for help.
 cqlsh>
 ----

build.xml

@@ -33,7 +33,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="5.1"/>
+    <property name="base.version" value="6.0"/>
     <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"/>

conf/cassandra.yaml

@@ -1481,7 +1481,7 @@ slow_query_log_timeout: 500ms
 # most users should never need to adjust this.
 # phi_convict_threshold: 8
 
-# IEndpointSnitch has been deprecated in Cassandra 5.1
+# IEndpointSnitch has been deprecated in Cassandra 6.0
 # Configuring a cluster with an IEndpointSnitch implementation using the endpoint_snitch setting remains supported,
 # but is superceded by the new settings detailed below.
 # endpoint_snitch -- Set this to a class that implements

debian/changelog

@@ -1,4 +1,4 @@
-cassandra (5.1) UNRELEASED; urgency=medium
+cassandra (6.0) UNRELEASED; urgency=medium
 
   * New release
 

doc/modules/cassandra/pages/managing/operating/virtualtables.adoc

@@ -438,7 +438,7 @@ Thread pool information includes active tasks, active tasks limit,
 blocked tasks, blocked tasks all time, completed tasks, and pending
 tasks. A query on the `thread_pools` returns following details:
 
-From 5.1 (CASSANDRA-19289), this table also displays core pool size, max pool size and max queued tasks values (visible
+From 6.0 (CASSANDRA-19289), this table also displays core pool size, max pool size and max queued tasks values (visible
 from `nodetool tpstats --verbose` as well.)
 
 [source, console]

doc/modules/cassandra/pages/new/index.adoc

@@ -1,9 +1,9 @@
 = New Features
 :navtitle: What's new
 
-== New Features in Apache Cassandra 5.1
+== New Features in Apache Cassandra 6.0
 
-This section covers the new features in Apache Cassandra 5.1.
+This section covers the new features in Apache Cassandra 6.0.
 
 * https://cwiki.apache.org/confluence/x/FQRACw[ACID Transactions (Accord)]
 * https://cwiki.apache.org/confluence/x/YyD1D[Transactional Cluster Metadata]

ide/nbproject/project.xml

@@ -187,9 +187,9 @@ public static Set<String> splitCommaDelimited(String src)
 
     public volatile DurationSpec.LongMillisecondsBound cms_await_timeout = new DurationSpec.LongMillisecondsBound("120000ms");
     public volatile int cms_default_max_retries = 10;
-    @Deprecated(since="5.1")
+    @Deprecated(since="6.0")
     public volatile DurationSpec.IntMillisecondsBound cms_default_retry_backoff = null;
-    @Deprecated(since="5.1")
+    @Deprecated(since="6.0")
     public volatile DurationSpec.IntMillisecondsBound cms_default_max_retry_backoff = null;
     public String cms_retry_delay = "50ms*attempts <= 500ms ... 100ms*attempts <= 1s,retries=10";