Skip to content

Bump dependencies#3186

Merged
AkihiroSuda merged 7 commits intocontainerd:masterfrom
thaJeztah:bump_dependencies
Apr 6, 2019
Merged

Bump dependencies#3186
AkihiroSuda merged 7 commits intocontainerd:masterfrom
thaJeztah:bump_dependencies

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

See individual commits for details

switch the licenses of cmd/ to be the same as the root

full diff: BurntSushi/toml@a368813...3012a1d

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
temporarily adds both pborman/uuid and google/uuid,
pending mistifyio/go-zfs#72

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Comment thread vendor.conf
github.com/containerd/zfs 31af176f2ae84fe142ef2655bf7bb2aa618b3b1f
github.com/mistifyio/go-zfs d5b163290a48f624cbf244ebe4e89ce38653064c
github.com/pborman/uuid v1.2.0
github.com/google/uuid v1.1.1
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We need both for now, as pborman/uuid is a thin wrapper around google/uuid; we can remove one if/once mistifyio/go-zfs#72 is merged

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3186 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #3186   +/-   ##
======================================
  Coverage    45.2%   45.2%           
======================================
  Files         111     111           
  Lines       11982   11982           
======================================
  Hits         5416    5416           
  Misses       5732    5732           
  Partials      834     834
Flag Coverage Δ
#linux 49.23% <ø> (ø) ⬆️
#windows 40.58% <ø> (-0.03%) ⬇️

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 591e52c...2583d9e. Read the comment docs.

1 similar comment
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3186 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #3186   +/-   ##
======================================
  Coverage    45.2%   45.2%           
======================================
  Files         111     111           
  Lines       11982   11982           
======================================
  Hits         5416    5416           
  Misses       5732    5732           
  Partials      834     834
Flag Coverage Δ
#linux 49.23% <ø> (ø) ⬆️
#windows 40.58% <ø> (-0.03%) ⬇️

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 591e52c...2583d9e. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

Comment thread vendor.conf
@thaJeztah
Copy link
Copy Markdown
Member Author

this good to go? 🙏

@AkihiroSuda AkihiroSuda merged commit 4d313c0 into containerd:master Apr 6, 2019
@thaJeztah thaJeztah deleted the bump_dependencies branch April 6, 2019 07:17
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