[27.x backport] Update containerd to v1.7.24#48934
Merged
Conversation
Signed-off-by: Derek McGowan <[email protected]> (cherry picked from commit a650dbd) Signed-off-by: Sebastiaan van Stijn <[email protected]>
vvoland
approved these changes
Nov 22, 2024
Member
Author
|
CI failing due to Docker Hub having an active incident; |
Contributor
Oh that is interesting, I haven't thought of that occurrence before. Was there compilation failures to inform you to revendor? |
Member
Author
|
Yeah, I think it complained about the file being modified but "deleted" in the branch, so it didn't go entirely unnoticed. I was aware of some changes being in master (and not in this branch) so I knew it was "ok" to fix up. The usual other conflicts with these are in |
Member
Author
|
In either case; all green now, so let me bring this one in 👍 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
(cherry picked from commit a650dbd)
Diff is slightly different in this branch, because we don't use all the same packages in 27.x