Skip to content

Conversation

@thaJeztah
Copy link
Member

Copy link
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan
Copy link
Member

Can you rebase this one to pick up the test fix?

thaJeztah and others added 2 commits June 12, 2024 22:57
partial backport of 56d80f8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
darccio/mergo@v0.3.13...v1.0.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 1f2216c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 1.7_bump_compress branch from 049361f to 327a3ac Compare June 12, 2024 20:57
@thaJeztah
Copy link
Member Author

@dmcgowan rebased 👍

@dmcgowan dmcgowan merged commit 3eb3e53 into containerd:release/1.7 Jun 12, 2024
@thaJeztah thaJeztah deleted the 1.7_bump_compress branch June 12, 2024 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants