Skip to content

Revendor Microsoft/hcsshim and go-winio#2557

Merged
dmcgowan merged 2 commits intocontainerd:masterfrom
lowenna:jjh/revendor
Aug 20, 2018
Merged

Revendor Microsoft/hcsshim and go-winio#2557
dmcgowan merged 2 commits intocontainerd:masterfrom
lowenna:jjh/revendor

Conversation

@lowenna
Copy link
Copy Markdown

@lowenna lowenna commented Aug 20, 2018

Signed-off-by: John Howard [email protected]

Bumps hcsshim to v0.6.14 and go-winio to v0.4.10. Required as a pre-req to re-vendoring these to moby/moby (moby/moby#37674) as containerd pulls in a previous version of go-winio and compilation otherwise fails.

@jterry75 FYI

@jterry75
Copy link
Copy Markdown
Contributor

LGTM

@jterry75
Copy link
Copy Markdown
Contributor

@jhowardmsft - CI is legit. In archive\tar_windows.go it was using these attrs. Need to submit an update there too.

@lowenna
Copy link
Copy Markdown
Author

lowenna commented Aug 20, 2018

@jterry75 Yup, that's fixed now.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2557 into master will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2557   +/-   ##
=======================================
  Coverage   44.59%   44.59%           
=======================================
  Files          95       95           
  Lines       10007    10007           
=======================================
  Hits         4463     4463           
  Misses       4822     4822           
  Partials      722      722
Flag Coverage Δ
#linux 48.4% <ø> (ø) ⬆️
#windows 41.54% <0%> (ø) ⬆️
Impacted Files Coverage Δ
archive/tar_windows.go 8.78% <0%> (ø) ⬆️

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 5d8ed81...2c4b7f6. Read the comment docs.

@jterry75
Copy link
Copy Markdown
Contributor

LGTM

2 similar comments
@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@dmcgowan
Copy link
Copy Markdown
Member

LGTM

@dmcgowan dmcgowan merged commit 3f42445 into containerd:master Aug 20, 2018
@lowenna lowenna deleted the jjh/revendor branch August 20, 2018 20:10
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.

5 participants