Merged
Conversation
dereknola
requested review from
anaxdev,
awmirantis,
mlimardo1984,
smerkviladze and
yevchuk-kostiantyn
as code owners
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com> Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Contributor
Author
|
@yevchuk-kostiantyn Any chance of a review on this and: |
athongsamai
added a commit
to athongsamai/cri-dockerd
that referenced
this pull request
Oct 28, 2025
(cherry picked from commit 89e7b95)
This was referenced Oct 28, 2025
athongsamai
added a commit
that referenced
this pull request
Oct 29, 2025
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
5 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.
Fixes #
This is part of an effort by the k3s-io org to upstream some of the commits we carry on top of the upstream project.
Proposed Changes
osversions of the same functions.logrus.Errorfto append the inner error (following general error convention)