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

[1.2] CHANGELOG: add (forward-port) v1.1.15 changes #4493

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

kolyshkin
Copy link
Contributor

Backport of #4489 to release-1.1 branch.

Those are taken from commit bc20cb4.

@kolyshkin kolyshkin added the backport/1.2-pr A backport PR to release-1.2 label Oct 30, 2024
@kolyshkin kolyshkin added this to the 1.2.1 milestone Oct 30, 2024
Those are taken from commit bc20cb4.

Signed-off-by: Kir Kolyshkin <[email protected]>
@lifubang
Copy link
Member

If you use ‘git cherry-pick -s -x’ to add the original commit id, it will be more better.

@rata
Copy link
Member

rata commented Nov 1, 2024

The cherry-pick doesn't apply cleany in 1.2, so a manual backport is needed.

Copy link
Member

@rata rata left a comment

Choose a reason for hiding this comment

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

LGTM

@rata rata mentioned this pull request Nov 1, 2024
@AkihiroSuda AkihiroSuda merged commit fe36d38 into opencontainers:release-1.2 Nov 1, 2024
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.2-pr A backport PR to release-1.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants