Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

[release/1.2] Better handle unknown state. - #1354

Merged
Random-Liu merged 1 commit into
containerd:release/1.2from
Random-Liu:cherrypick-#1351-release-1.2
Dec 9, 2019
Merged

Random-Liu merged 1 commit into
containerd:release/1.2from
Random-Liu:cherrypick-#1351-release-1.2

Conversation

@Random-Liu

Copy link
Copy Markdown
Member

Cherrypick #1351 release 1.2
Signed-off-by: Lantao Liu lantaol@google.com

Signed-off-by: Lantao Liu <lantaol@google.com>

@mikebrow mikebrow left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@Random-Liu Random-Liu added the lgtm label Dec 9, 2019
@Random-Liu
Random-Liu merged commit 5420c6f into containerd:release/1.2 Dec 9, 2019
@Random-Liu
Random-Liu deleted the cherrypick-#1351-release-1.2 branch December 9, 2019 21:47
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Jan 30, 2020
…(release/1.2 branch)

full diff: containerd/cri@bab7348...b075cc4

relevant changes:

- containerd/cri#1305 [release/1.2] Sync vendors with containerd
- containerd/cri#1354 [release/1.2] Better handle unknown state
- containerd/cri#1388 [release/1.2] vendor: bump gopkg.in/yaml.v2 v2.2.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants