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

Bump containerd to 1.6.14 #2536

Merged
merged 1 commit into from
Dec 20, 2022
Merged

Bump containerd to 1.6.14 #2536

merged 1 commit into from
Dec 20, 2022

Conversation

ncopa
Copy link
Collaborator

@ncopa ncopa commented Dec 19, 2022

https://github.com/containerd/containerd/releases/tag/v1.6.14

Signed-off-by: Natanael Copa [email protected]

Description

Fixes # (issue)

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@ncopa ncopa requested a review from a team as a code owner December 19, 2022 18:53
@ncopa ncopa added chore backport/release-1.24 PR that needs to be backported/cherrypicked to release-1.24 branch backport/release-1.25 PR that needs to be backported/cherrypicked to release-1.25 branch labels Dec 19, 2022
@ncopa ncopa merged commit aa82f64 into k0sproject:main Dec 20, 2022
@k0s-bot
Copy link

k0s-bot commented Dec 20, 2022

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

Please cherry-pick the changes locally.

git fetch origin release-1.24
git worktree add -d .worktree/backport-2536-to-release-1.24 origin/release-1.24
cd .worktree/backport-2536-to-release-1.24
git checkout -b backport-2536-to-release-1.24
ancref=$(git merge-base a6b8efdec53a8d4f286fe92ebc515b50c07b917b cf3731819c001a4a7a884d484877f129b4e0a93c)
git cherry-pick -x $ancref..cf3731819c001a4a7a884d484877f129b4e0a93c

@k0s-bot
Copy link

k0s-bot commented Dec 20, 2022

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

Please cherry-pick the changes locally.

git fetch origin release-1.25
git worktree add -d .worktree/backport-2536-to-release-1.25 origin/release-1.25
cd .worktree/backport-2536-to-release-1.25
git checkout -b backport-2536-to-release-1.25
ancref=$(git merge-base a6b8efdec53a8d4f286fe92ebc515b50c07b917b cf3731819c001a4a7a884d484877f129b4e0a93c)
git cherry-pick -x $ancref..cf3731819c001a4a7a884d484877f129b4e0a93c

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

Successfully merging this pull request may close these issues.

3 participants