[release/1.4] Re-vendor CRI to get disabled annotation config default#4689
Merged
AkihiroSuda merged 1 commit intocontainerd:release/1.4from Nov 3, 2020
Merged
[release/1.4] Re-vendor CRI to get disabled annotation config default#4689AkihiroSuda merged 1 commit intocontainerd:release/1.4from
AkihiroSuda merged 1 commit intocontainerd:release/1.4from
Conversation
|
Build succeeded.
|
AkihiroSuda
reviewed
Nov 3, 2020
Signed-off-by: Phil Estes <[email protected]>
|
Build succeeded.
|
AkihiroSuda
approved these changes
Nov 3, 2020
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This is the "cherry pick" of the CRI config change in #4665, but via a PR against the 1.4 branch in the now-merged CRI sub-project and now a re-vendor.
This includes a few other minor changes in the CRI branch.
Signed-off-by: Phil Estes [email protected]