Skip to content

Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6#3607

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
awesomenix:updatecri
Sep 4, 2019
Merged

Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6#3607
dmcgowan merged 1 commit intocontainerd:masterfrom
awesomenix:updatecri

Conversation

@awesomenix
Copy link
Copy Markdown
Contributor

No description provided.

@awesomenix
Copy link
Copy Markdown
Contributor Author

/assign @Random-Liu

@estesp
Copy link
Copy Markdown
Member

estesp commented Aug 30, 2019

This commit isn't signed so CI is going to fail on the DCO check--easy fix git commit -s --amend and then force push :)

@awesomenix
Copy link
Copy Markdown
Contributor Author

Thanks @estesp, thought git commit -m -S does the sign off too :(

     -s, --signoff         add Signed-off-by:
    -S, --gpg-sign[=<key-id>]
                          GPG sign commit

Fixed release 1.2 branch as well

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 30, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3607 into master will increase coverage by 0.25%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3607      +/-   ##
==========================================
+ Coverage   42.39%   42.64%   +0.25%     
==========================================
  Files         126      126              
  Lines       13891    13989      +98     
==========================================
+ Hits         5889     5966      +77     
- Misses       7116     7118       +2     
- Partials      886      905      +19
Flag Coverage Δ
#linux 46.21% <ø> (+0.28%) ⬆️
#windows 37.2% <ø> (ø) ⬆️
Impacted Files Coverage Δ
snapshots/devmapper/pool_device.go 63.55% <0%> (+6.6%) ⬆️

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 4a75a63...b6c811b. 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

@estesp estesp added this to the 1.3 milestone Sep 4, 2019
@estesp
Copy link
Copy Markdown
Member

estesp commented Sep 4, 2019

Pretty sure this bug fix should be in 1.3 // cc: @dmcgowan

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Sep 4, 2019

LGTM

The original PR was here containerd/cri#1253

@dmcgowan dmcgowan merged commit d540b10 into containerd:master Sep 4, 2019
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