Skip to content

Commit 02ee6de

Browse files
committed
revert: restore versions/scylla/4.19.0.8/patch to original
4.19.0.8 is not in any pipeline's test matrix (tested range is 4.18.1.0 -> 4.19.0.9). Scope this PR to the three versions that are actually validated by CI.
1 parent 9f24e2c commit 02ee6de

1 file changed

Lines changed: 1 addition & 12 deletions

File tree

  • versions/scylla/4.19.0.8

versions/scylla/4.19.0.8/patch

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -529,18 +529,7 @@ index e7b2b4e4a..a4b2ecea7 100644
529529
}
530530

531531
// Copied from Netty's PlatformDependent to avoid the dependency on Netty
532-
@@ -343,7 +346,9 @@
533-
if (shouldReplace) {
534-
versionString = versionString.replace(".0-", ".");
535-
}
536-
- return "release:" + versionString;
537-
+ // Dropping "release:" prefix so CCM uses the locally-installed Scylla package instead of
538-
+ // attempting to download from S3. See versions/scylla/4.18.1.0/patch for the same fix.
539-
+ return versionString;
540-
}
541-
// for 4.0 or 5.0 pre-releases, the CCM version string needs to be "4.0-alpha1", "4.0-alpha2" or
542-
// "5.0-beta1" Version.toString() always adds a patch value, even if it's not specified when
543-
@@ -503,7 +508,18 @@ public class CcmBridge implements AutoCloseable {
532+
@@ -503,7 +506,18 @@ public class CcmBridge implements AutoCloseable {
544533
}
545534

546535
public void addWithoutStart(int n, String dc) {

0 commit comments

Comments
 (0)