Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.7] restart: containerd.io/restart.logpath warning #9567

Conversation

samuelkarp
Copy link
Member

Part of #9312

Signed-off-by: Samuel Karp <samuelkarp@google.com>
@samuelkarp samuelkarp mentioned this pull request Dec 21, 2023
3 tasks
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid fuweid merged commit 6d0a3b6 into containerd:release/1.7 Dec 21, 2023
56 checks passed
@samuelkarp samuelkarp deleted the deprecation-warning-restart-logpath-1.7 branch December 21, 2023 10:56
@samuelkarp samuelkarp added the cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch label Dec 21, 2023
@samuelkarp
Copy link
Member Author

/cherrypick release/1.6

@k8s-infra-cherrypick-robot

@samuelkarp: #9567 failed to apply on top of branch "release/1.6":

Applying: restart: containerd.io/restart.logpath warning
Using index info to reconstruct a base tree...
M	pkg/deprecation/deprecation.go
M	runtime/restart/monitor/change.go
M	runtime/restart/monitor/monitor.go
Falling back to patching base and 3-way merge...
Auto-merging runtime/restart/monitor/monitor.go
CONFLICT (content): Merge conflict in runtime/restart/monitor/monitor.go
Auto-merging runtime/restart/monitor/change.go
CONFLICT (content): Merge conflict in runtime/restart/monitor/change.go
Auto-merging pkg/deprecation/deprecation.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 restart: containerd.io/restart.logpath warning
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/1.6

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants