Skip to content

[release/1.5] Backport #5446 to release 1.5.#5447

Merged
estesp merged 1 commit intocontainerd:release/1.5from
Random-Liu:cherrypick-#5446-release-1.5
May 12, 2021
Merged

[release/1.5] Backport #5446 to release 1.5.#5447
estesp merged 1 commit intocontainerd:release/1.5from
Random-Liu:cherrypick-#5446-release-1.5

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

For #5330.

Signed-off-by: Lantao Liu [email protected]

@AkihiroSuda
Copy link
Copy Markdown
Member

Could you use git cherry-pick -xsS for cherry-picking?

@AkihiroSuda AkihiroSuda marked this pull request as draft May 4, 2021 10:54
@AkihiroSuda
Copy link
Copy Markdown
Member

Marking as a draft, as #5446 isn't merged yet

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow marked this pull request as ready for review May 5, 2021 14:01
@estesp
Copy link
Copy Markdown
Member

estesp commented May 5, 2021

@Random-Liu per @AkihiroSuda:

Could you use git cherry-pick -xsS for cherry-picking?

Now that #5446 is merged this should be possible.

@dmcgowan dmcgowan added this to the 1.5.1 milestone May 11, 2021
@dmcgowan dmcgowan changed the title Backport #5446 to release 1.5. [release/1.5] Backport #5446 to release 1.5. May 11, 2021
@dmcgowan
Copy link
Copy Markdown
Member

Ping, do we want to update the commit here? We want to get this into 1.5.1

Signed-off-by: Lantao Liu <[email protected]>
(cherry picked from commit 81402e4)
Signed-off-by: Lantao Liu <[email protected]>
@Random-Liu Random-Liu force-pushed the cherrypick-#5446-release-1.5 branch from bd5811f to 5e742ea Compare May 11, 2021 22:12
@Random-Liu
Copy link
Copy Markdown
Member Author

Updated. :)

Copy link
Copy Markdown
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit eebc914 into containerd:release/1.5 May 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants