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

[Backport release-1.30] Bump containerd to v1.7.18 #4591

Merged
merged 1 commit into from
Jun 12, 2024

Conversation

k0s-bot
Copy link

@k0s-bot k0s-bot commented Jun 11, 2024

Automated backport to release-1.30, triggered by a label in #4552.
See .

@k0s-bot k0s-bot requested a review from a team as a code owner June 11, 2024 13:12
@k0s-bot k0s-bot requested review from ncopa and makhov June 11, 2024 13:12
@k0s-bot k0s-bot mentioned this pull request Jun 11, 2024
16 tasks
@twz123 twz123 added area/containers chore component/containerd backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch labels Jun 11, 2024
@twz123 twz123 merged commit 03230d0 into release-1.30 Jun 12, 2024
87 checks passed
@twz123 twz123 deleted the backport-4552-to-release-1.30 branch June 12, 2024 08:33
@k0s-bot
Copy link
Author

k0s-bot commented Jun 12, 2024

Backport failed for release-1.29, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.29
git worktree add -d .worktree/backport-4591-to-release-1.29 origin/release-1.29
cd .worktree/backport-4591-to-release-1.29
git switch --create backport-4591-to-release-1.29
git cherry-pick -x 974c151d9261a31b661621555cf9f41d32aa477c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/containers backport/release-1.29 PR that needs to be backported/cherrypicked to the release-1.29 branch chore component/containerd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants