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

[18.09 backport] bump dependencies #1440

Merged
merged 2 commits into from
Oct 23, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Oct 11, 2018

take some of the remaining commits from #1393 (buildkit bump was included in #1438)

Bump Microsoft/hcsshim to v0.7.3, Microsoft/go-winio to v0.4.11

Full diffs:

Bump containerd to d97a907f7f781c0ab8340877d8e6b53cc7f1c2f6

### Bump etcd dependencies

etcd was updated to v3.3.9 in (#1230), but dependencies were not bumped. This bumps dependencies to the same versions as was done upstream in moby/moby moby/moby#37805

(obsoleted by #2100, commit 8a0a5f0)

@thaJeztah thaJeztah added this to the 18.09.0 milestone Oct 11, 2018
@codecov-io
Copy link

codecov-io commented Oct 11, 2018

Codecov Report

Merging #1440 into 18.09 will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            18.09    #1440   +/-   ##
=======================================
  Coverage   54.28%   54.28%           
=======================================
  Files         291      291           
  Lines       19459    19459           
=======================================
  Hits        10563    10563           
  Misses       8215     8215           
  Partials      681      681

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.

LGTM

@thaJeztah thaJeztah modified the milestones: 18.09.0, 18.09.1 Nov 8, 2018
@thaJeztah thaJeztah modified the milestones: 18.09.1, 18.09.2 Jan 24, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.2, 18.09.3 Feb 11, 2019
@andrewhsu andrewhsu modified the milestones: 18.09.3, 18.09.4 Mar 4, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.4, 18.09.5 Mar 28, 2019
@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_dependencies branch from dbd04ae to 219bcc7 Compare March 28, 2019 17:25
@thaJeztah
Copy link
Member Author

thaJeztah commented Mar 28, 2019

rebased to run CI again (no conflicts)

@thaJeztah thaJeztah modified the milestones: 18.09.5, 18.09.6 Apr 11, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.6, 18.09.7 Jun 14, 2019
@andrewhsu andrewhsu modified the milestones: 18.09.7, 18.09.8 Jun 27, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.8, 18.09.9 Jul 18, 2019
@kolyshkin
Copy link
Contributor

This needs to be rebased now when #1961 is in

@thaJeztah thaJeztah changed the title [18.09] backport bump dependencies [18.09 backport] bump dependencies Aug 30, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.9, 18.09.10 Aug 30, 2019
@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_dependencies branch from 219bcc7 to 087f6d0 Compare August 30, 2019 10:27
@thaJeztah
Copy link
Member Author

rebased (but don't merge; too late for 18.09.9 patch release)

@thaJeztah thaJeztah modified the milestones: 18.09.10, 18.09.11 Oct 10, 2019
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 943a2d1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 036b8f7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@kolyshkin kolyshkin force-pushed the 18.09_backport_bump_dependencies branch from 087f6d0 to 402c2bc Compare October 23, 2019 16:24
@kolyshkin
Copy link
Contributor

Rebased to current head (50c4621), minor conflict in vendor.conf because of #2080 being merged, resolved manually

Copy link
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit c2ae869 into docker:18.09 Oct 23, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_bump_dependencies branch October 24, 2019 01:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants