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

[release/1.4 backport] add missing body.Close() in docker/fetcher and docker/pusher #5773

Merged

Conversation

thaJeztah
Copy link
Member

Backport of #5769 and #5770

Second commit did not apply cleanly, and had a minor conflict in the if resp.StatusCode != http.StatusNotFound block, because commit 2de5506 is not in this branch.

Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
(cherry picked from commit 67d07fe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Minor conflict in the if resp.StatusCode != http.StatusNotFound block,
because commit 2de5506 is not in this
branch.

Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
(cherry picked from commit 53ec1ab)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Jul 21, 2021

Build succeeded.

Copy link
Member

@dmcgowan dmcgowan 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 dmcgowan merged commit 53add4c into containerd:release/1.4 Jul 21, 2021
@thaJeztah thaJeztah deleted the 1.4_backport_fix_missing_body_close branch July 21, 2021 22:38
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.

None yet

4 participants