This is an automated email from the ASF dual-hosted git repository.
jmckenzie pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e73b7ba2c03b0fca0c4f4312af2a0a93c88fa988
Merge: 9355e70eaf 67e9f7bdc4
Author: Josh McKenzie <jmcken...@apache.org>
AuthorDate: Mon Sep 12 13:07:10 2022 -0400
Merge branch 'cassandra-4.1' into trunk
.../upgrade/MixedModeMessageForwardTest.java | 43 ++++++++++++++++------
1 file changed, 32 insertions(+), 11 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
index c2c4b88ba0,d1551fbacb..fe85c01adc
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
@@@ -79,10 -100,10 +100,10 @@@ public class MixedModeMessageForwardTes
.collect(Collectors.joining(","));
new TestCase()
- .withConfig(c -> c.with(Feature.GOSSIP,
Feature.NETWORK).set("request_timeout_in_ms", 30000))
+ .withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
.withBuilder(b -> b.withRacks(numDCs, 1, nodesPerDc))
.nodes(numDCs * nodesPerDc)
- .singleUpgrade(v30)
+ .singleUpgradeToCurrentFrom(v30)
.setup(cluster -> {
cluster.schemaChange("ALTER KEYSPACE " + KEYSPACE +
" WITH replication = {'class': 'NetworkTopologyStrategy', " +
ntsArgs + " };");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
