This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 99bf8ba465b15baa59d3dc4e0ed861721dabd191
Merge: 963c24969e 2480a7e7ee
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Tue May 3 20:46:45 2022 +0200
Merge branch 'cassandra-4.1' into trunk
.circleci/config-2_1.yml | 2 +-
.circleci/config.yml | 2 +-
.circleci/config.yml.HIGHRES | 2 +-
.circleci/config.yml.LOWRES | 2 +-
.circleci/config.yml.MIDRES | 2 +-
.../org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java | 7 ++++++-
6 files changed, 11 insertions(+), 6 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
index 5c32fcdd3b,5c32fcdd3b..e530dbdc45
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
@@@ -86,14 -86,14 +86,19 @@@ public class UpgradeTestBase extends Di
public static final Semver v3X = new Semver("3.11.0", SemverType.LOOSE);
public static final Semver v40 = new Semver("4.0-alpha1",
SemverType.LOOSE);
public static final Semver v41 = new Semver("4.1-alpha1",
SemverType.LOOSE);
++ public static final Semver v42 = new Semver("4.2-alpha1",
SemverType.LOOSE);
protected static final List<Pair<Semver,Semver>> SUPPORTED_UPGRADE_PATHS
= ImmutableList.of(
Pair.create(v30, v3X),
Pair.create(v30, v40),
Pair.create(v30, v41),
++ Pair.create(v30, v42),
Pair.create(v3X, v40),
Pair.create(v3X, v41),
-- Pair.create(v40, v41));
++ Pair.create(v3X, v42),
++ Pair.create(v40, v41),
++ Pair.create(v40, v42),
++ Pair.create(v41, v42));
// the last is always the current
public static final Semver CURRENT =
SUPPORTED_UPGRADE_PATHS.get(SUPPORTED_UPGRADE_PATHS.size() - 1).right;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
