Revert "Merge pull request #385 from openshift/1.6-bump" #388
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@gkurz: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
bpradipt
added
the
do-not-merge
|
@gkurz the downstream builds have already been triggered based on the merged commit. Let's wait for the first build to happen before merging this. |
|
Downstream builds completed.. |
bpradipt
removed
the
do-not-merge
beraldoleal
approved these changes
Apr 3, 2024
gkurz
added a commit
to gkurz/sandboxed-containers-operator
that referenced
this pull request
Apr 4, 2024
gkurz
added a commit
to gkurz/sandboxed-containers-operator
that referenced
this pull request
Apr 4, 2024
gkurz
added a commit
to gkurz/sandboxed-containers-operator
that referenced
this pull request
Apr 4, 2024
This brings CSV fixes from openshift#389 and openshift#391, that we do want in devel. This also brings openshift#388 that we *do not* want since it removes all the 1.6.0 code from devel. This is addressed by a subsequent commit.
gkurz
added a commit
to gkurz/sandboxed-containers-operator
that referenced
this pull request
Apr 4, 2024
The change from openshift#388 was only to remove 1.6.0 code that was merged too early into main. This should certainly not be merged back into devel. This reverts commit bb538b1, reversing changes made to 1082483. Signed-off-by: Greg Kurz <groug@kaod.org>
gkurz
added a commit
to gkurz/sandboxed-containers-operator
that referenced
this pull request
Apr 8, 2024
gkurz
added a commit
to gkurz/sandboxed-containers-operator
that referenced
this pull request
Apr 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Code for 1.6.0 landed early in the main branch by mistake. We need proper builds from devel to be tested by QE first and we still have 1 sprint to go until the release.
This reverts commit 1082483, reversing changes made to 2a9ed5e.