Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: bump docker/docker, docker/swarmkit, and dependencies #2711

Merged
merged 11 commits into from
Sep 9, 2020

Conversation

thaJeztah
Copy link
Member

see individual commits for details

@thaJeztah thaJeztah marked this pull request as draft September 9, 2020 12:36
@thaJeztah
Copy link
Member Author

Looks like go-metrics needs to be updated for changes in prometheus;

=== Errors
vendor/github.com/docker/go-metrics/handler.go:12:9: undefined: prometheus.Handler
vendor/github.com/docker/go-metrics/timer.go:39:16: cannot use lt.m.WithLabelValues(labels...) (type prometheus.Observer) as type prometheus.Histogram in field value:
	prometheus.Observer does not implement prometheus.Histogram (missing Collect method)

@thaJeztah
Copy link
Member Author

Ah! Looks like I mentioned that in #2333 (comment), but forgot to open a PR for it 😅

@codecov-commenter
Copy link

Codecov Report

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

@@           Coverage Diff           @@
##           master    #2711   +/-   ##
=======================================
  Coverage   58.54%   58.54%           
=======================================
  Files         296      296           
  Lines       21286    21286           
=======================================
  Hits        12462    12462           
  Misses       7915     7915           
  Partials      909      909           

@thaJeztah thaJeztah marked this pull request as ready for review September 9, 2020 13:03
@thaJeztah
Copy link
Member Author

@silvin-lubecki PTAL

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

Looks good 👍

@silvin-lubecki silvin-lubecki merged commit 60abe96 into docker:master Sep 9, 2020
@thaJeztah thaJeztah deleted the bump_engine branch September 9, 2020 13:19
@thaJeztah thaJeztah added this to the 20.10.0 milestone Jan 5, 2021
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.

3 participants