[Backport release-1.31] Bump containerd to v1.7.24 #5339
Merged
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
twz123
added
area/containers
chore
component/containerd
backport/release-1.30
jnummelin
reviewed
Dec 11, 2024
cmd/controller/controller.go
Outdated
There was a problem hiding this comment.
These seem bit unrelated changes?
There was a problem hiding this comment.
huh, how come... 😮 I didn't even look at the diff, after the usual cherry-pick 🙈
https://github.com/containerd/containerd/releases/tag/v1.7.24 Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit 8d59bdb)
twz123
force-pushed
the
backport-5314-to-release-1.31
branch
from
5f1bddb to
6bb5702
Compare
jnummelin
approved these changes
Dec 11, 2024
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-1.30
git worktree add -d .worktree/backport-5339-to-release-1.30 origin/release-1.30
cd .worktree/backport-5339-to-release-1.30
git switch --create backport-5339-to-release-1.30
git cherry-pick -x 6bb570202c7d09a0fec8212e4ab76fbbda57553d |
This was referenced Dec 11, 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.
Backport to
release-1.31: