apache
diff --git a/‎README.asc‎
Lines changed: 1 addition & 1 deletion b/‎README.asc‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/data/config/version=7.0-alpha1.yml‎
Lines changed: 495 additions & 0 deletions b/‎test/data/config/version=7.0-alpha1.yml‎
Lines changed: 495 additions & 0 deletions
diff --git a/‎…/serialization/5.1/gms.EndpointState.bin‎ ‎…/serialization/6.0/gms.EndpointState.bin‎test/data/serialization/5.1/gms.EndpointState.bin renamed to test/data/serialization/6.0/gms.EndpointState.bin b/‎…/serialization/5.1/gms.EndpointState.bin‎ ‎…/serialization/6.0/gms.EndpointState.bin‎test/data/serialization/5.1/gms.EndpointState.bin renamed to test/data/serialization/6.0/gms.EndpointState.bin
diff --git a/‎…st/data/serialization/5.1/gms.Gossip.bin‎ ‎…st/data/serialization/6.0/gms.Gossip.bin‎test/data/serialization/5.1/gms.Gossip.bin renamed to test/data/serialization/6.0/gms.Gossip.bin b/‎…st/data/serialization/5.1/gms.Gossip.bin‎ ‎…st/data/serialization/6.0/gms.Gossip.bin‎test/data/serialization/5.1/gms.Gossip.bin renamed to test/data/serialization/6.0/gms.Gossip.bin
diff --git a/‎…rialization/5.1/service.SyncComplete.bin‎ ‎…rialization/6.0/service.SyncComplete.bin‎test/data/serialization/5.1/service.SyncComplete.bin renamed to test/data/serialization/6.0/service.SyncComplete.bin b/‎…rialization/5.1/service.SyncComplete.bin‎ ‎…rialization/6.0/service.SyncComplete.bin‎test/data/serialization/5.1/service.SyncComplete.bin renamed to test/data/serialization/6.0/service.SyncComplete.bin
diff --git a/‎…erialization/5.1/service.SyncRequest.bin‎ ‎…erialization/6.0/service.SyncRequest.bin‎test/data/serialization/5.1/service.SyncRequest.bin renamed to test/data/serialization/6.0/service.SyncRequest.bin b/‎…erialization/5.1/service.SyncRequest.bin‎ ‎…erialization/6.0/service.SyncRequest.bin‎test/data/serialization/5.1/service.SyncRequest.bin renamed to test/data/serialization/6.0/service.SyncRequest.bin
diff --git a/‎…ation/5.1/service.ValidationComplete.bin‎ ‎…ation/6.0/service.ValidationComplete.bin‎test/data/serialization/5.1/service.ValidationComplete.bin renamed to test/data/serialization/6.0/service.ValidationComplete.bin b/‎…ation/5.1/service.ValidationComplete.bin‎ ‎…ation/6.0/service.ValidationComplete.bin‎test/data/serialization/5.1/service.ValidationComplete.bin renamed to test/data/serialization/6.0/service.ValidationComplete.bin
diff --git a/‎…zation/5.1/service.ValidationRequest.bin‎ ‎…zation/6.0/service.ValidationRequest.bin‎test/data/serialization/5.1/service.ValidationRequest.bin renamed to test/data/serialization/6.0/service.ValidationRequest.bin b/‎…zation/5.1/service.ValidationRequest.bin‎ ‎…zation/6.0/service.ValidationRequest.bin‎test/data/serialization/5.1/service.ValidationRequest.bin renamed to test/data/serialization/6.0/service.ValidationRequest.bin
diff --git a/‎…ization/5.1/utils.EstimatedHistogram.bin‎ ‎…ization/6.0/utils.EstimatedHistogram.bin‎test/data/serialization/5.1/utils.EstimatedHistogram.bin renamed to test/data/serialization/6.0/utils.EstimatedHistogram.bin b/‎…ization/5.1/utils.EstimatedHistogram.bin‎ ‎…ization/6.0/utils.EstimatedHistogram.bin‎test/data/serialization/5.1/utils.EstimatedHistogram.bin renamed to test/data/serialization/6.0/utils.EstimatedHistogram.bin
diff --git a/‎test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java‎
Lines changed: 8 additions & 0 deletions b/‎test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java‎
Lines changed: 8 additions & 0 deletions
@@ -52,7 +52,7 @@ be sitting in front of a prompt:
 
 ----
 Connected to Test Cluster at localhost:9160.
-[cqlsh 6.3.0 | Cassandra 6.0-SNAPSHOT | CQL spec 3.4.8 | Native protocol v5]
+[cqlsh 6.3.0 | Cassandra 7.0-SNAPSHOT | CQL spec 3.4.8 | Native protocol v5]
 Use HELP for help.
 cqlsh>
 ----
 
@@ -100,14 +100,22 @@ public static interface RunOnClusterAndNode
     public static final Semver v42 = new Semver("4.2-alpha1", SemverType.LOOSE);
     public static final Semver v50 = new Semver("5.0-alpha1", SemverType.LOOSE);
     public static final Semver v60 = new Semver("6.0-alpha1", SemverType.LOOSE);
+    public static final Semver v70 = new Semver("7.0-alpha1", SemverType.LOOSE);
 
     protected static final SimpleGraph<Semver> SUPPORTED_UPGRADE_PATHS = new SimpleGraph.Builder<Semver>()
+                                                                         // 40 edges are here temporarily
+                                                                         // until we resolve CASSANDRA-21324
                                                                          .addEdge(v40, v41)
                                                                          .addEdge(v40, v50)
                                                                          .addEdge(v40, v60)
+                                                                         .addEdge(v40, v70)
+                                                                         /////
                                                                          .addEdge(v41, v50)
                                                                          .addEdge(v41, v60)
+                                                                         .addEdge(v41, v70)
                                                                          .addEdge(v50, v60)
+                                                                         .addEdge(v50, v70)
+                                                                         .addEdge(v60, v70)
                                                                          .build();
 
     // the last is always the current