Skip to content

Correct import path and PusherFunc signature#3213

Merged
crosbymichael merged 2 commits intocontainerd:masterfrom
jcordasc:small-fixes
Apr 16, 2019
Merged

Correct import path and PusherFunc signature#3213
crosbymichael merged 2 commits intocontainerd:masterfrom
jcordasc:small-fixes

Conversation

@jcordasc
Copy link
Copy Markdown

Fixes #3212.

This PR corrects an import statement in services/server/server_solaris.go and updates the PusherFunc type's function signature in the containerd/remotes package to match the Pusher interface.

@jcordasc
Copy link
Copy Markdown
Author

I'm not sure what more needs to be documented for such a small miscellaneous fix PR, so if there is anything else you'd like just let me know. Thanks!

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Apr 12, 2019

hi @jcordasc thanks for the update. Could you please repush again? the ci failure is caused by the flaky case. Thanks

@codecov-io
Copy link
Copy Markdown

codecov-io commented Apr 12, 2019

Codecov Report

Merging #3213 into master will decrease coverage by 4.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3213      +/-   ##
==========================================
- Coverage   48.81%   44.76%   -4.05%     
==========================================
  Files         102      113      +11     
  Lines        9538    12125    +2587     
==========================================
+ Hits         4656     5428     +772     
- Misses       4056     5862    +1806     
- Partials      826      835       +9
Flag Coverage Δ
#linux 48.81% <ø> (ø) ⬆️
#windows 40.01% <ø> (?)
Impacted Files Coverage Δ
snapshots/native/native.go 43.04% <0%> (-9.99%) ⬇️
metadata/snapshot.go 45.8% <0%> (-8.96%) ⬇️
archive/tar.go 43.79% <0%> (-7.07%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 57.84% <0%> (-6.36%) ⬇️
content/local/store.go 49.51% <0%> (-5.15%) ⬇️
metadata/images.go 57.57% <0%> (-4.99%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
metadata/buckets.go 56.33% <0%> (-4.6%) ⬇️
... and 63 more

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 5f4c977...fc167f9. 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

@dmcgowan can you confirm the PusherFunc fix is correct? Looks correct given the Push interface definition.

Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

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.

Problem vendoring non-rc v1.2.x of containerd/services/server due to broken import path

7 participants