This repository was archived by the owner on Mar 9, 2022. It is now read-only.
Port docker resolver fix #2364.#793
Merged
Random-Liu merged 1 commit intoMay 31, 2018
Merged
Conversation
Member
Author
|
We should cherry-pick this, and catch on the containerd v1.1.1 release train. |
Random-Liu
force-pushed
the
port-containerd-fix-#2364
branch
from
600484e to
3db8662
Compare
Signed-off-by: Lantao Liu <lantaol@google.com>
Random-Liu
force-pushed
the
port-containerd-fix-#2364
branch
from
3db8662 to
0fae42b
Compare
mikebrow
reviewed
May 31, 2018
| @@ -0,0 +1,94 @@ | |||
| /* | |||
| Copyright 2018 The Containerd Authors. | |||
|
|
|||
Member
There was a problem hiding this comment.
Was going to say.. boiler plate mismatch.. see you already fixed it.
mikebrow
approved these changes
May 31, 2018
mikebrow
left a comment
mikebrow
left a comment
Member
There was a problem hiding this comment.
/LGTM
see nit on todo format
|
|
||
| } | ||
| } else { | ||
| // TODO: Should any cases where use of content range |
Member
Author
There was a problem hiding this comment.
This is copied from the original containerd fix. Wanna to keep change minimal so as to make it easier to maintain the fork or consolidate in the future.
Member
There was a problem hiding this comment.
yes I saw it was a copy.. todo comment would not be a large diff :-) but already approved skip the nit .. merge away!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Port docker resolver fix containerd/containerd#2364.
We should really get rid of the fork. #723
/cc @abhi @dmcgowan
Signed-off-by: Lantao Liu lantaol@google.com