Skip to content

[release/1.2] vendor: bump containerd/cri b075cc4e9f394780dbed101601c48dcc3d37c828 (release/1.2 branch)#3993

Merged
mxpv merged 2 commits intocontainerd:release/1.2from
thaJeztah:1.2_update_containerd_cri
Jan 30, 2020
Merged

[release/1.2] vendor: bump containerd/cri b075cc4e9f394780dbed101601c48dcc3d37c828 (release/1.2 branch)#3993
mxpv merged 2 commits intocontainerd:release/1.2from
thaJeztah:1.2_update_containerd_cri

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

vendor: bump containerd/cri b075cc4e9f394780dbed101601c48dcc3d37c828 (release/1.2 branch)

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

relevant changes:

vendor: bump gopkg.in/yaml.v2 v2.2.8

full diff: go-yaml/yaml@v2.2.1...v2.2.8

Includes go-yaml/yaml@bb4e33b
to address CVE-2019-11253

…(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 <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3993 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3993   +/-   ##
============================================
  Coverage        44.19%   44.19%           
============================================
  Files              100      100           
  Lines            10847    10847           
============================================
  Hits              4794     4794           
  Misses            5313     5313           
  Partials           740      740
Flag Coverage Δ
#linux 47.87% <ø> (ø) ⬆️
#windows 41% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 92b40b6...c12aaf0. Read the comment docs.

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

@mxpv mxpv left a comment

Choose a reason for hiding this comment

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

LGTM

@mxpv mxpv merged commit a558638 into containerd:release/1.2 Jan 30, 2020
@thaJeztah thaJeztah deleted the 1.2_update_containerd_cri branch January 31, 2020 14:06
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.

4 participants