Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.03] vndr swarmkit to 49a9d7f #451

Merged
merged 2 commits into from
Mar 6, 2018
Merged

[18.03] vndr swarmkit to 49a9d7f #451

merged 2 commits into from
Mar 6, 2018

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Mar 6, 2018 •
edited
Loading

brings in the following changes:

vndr engine:

$ cd components/engine
$ vi vendor.conf
$ make BIND_DIR=. shell
$ vndr github.com/docker/swarmkit

vndr cli:

$ cd components/cli
$ vi vendor.conf
$ make -f docker.Makefile shell
$ vndr github.com/docker/swarmkit

comparison of upstream changes: moby/swarmkit@f74983e...49a9d7f

@andrewhsu
engine: vndr swarmkit 49a9d7f
652953a 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
cli: vndr swarmkit 49a9d7f
1b39f8b 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 18.03.0 milestone Mar 6, 2018
@thaJeztah
Copy link
Member

This includes the changes from moby/moby#36371

This was referenced Mar 6, 2018
Merged
Merged
@thaJeztah
Copy link
Member

Opened #453 (based on top of this PR) to also bring in moby/swarmkit#2523

@andrewhsu andrewhsu merged commit 3ab4d93 into docker-archive:18.03 Mar 6, 2018
@andrewhsu andrewhsu deleted the md branch March 6, 2018 15:46
docker-jenkins pushed a commit that referenced this pull request Jan 23, 2020
@thaJeztah
Merge pull request #451 from thaJeztah/19.03_backport_swagger_fixes
169849f 
[19.03 backport] assorted swagger / API docs fixes
Upstream-commit: abfed203eb1b64af5b9fab8d5f8d0ac3a9be7f93
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 24, 2020
@andrewhsu
Merge pull request docker-archive#451 from andrewhsu/md
192e764 
[18.03] vndr swarmkit to 49a9d7f
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 31, 2020
@andrewhsu
Merge pull request docker-archive#451 from andrewhsu/md
3a14d3a 
[18.03] vndr swarmkit to 49a9d7f
docker-jenkins pushed a commit that referenced this pull request Apr 14, 2020
@silvin-lubecki
Merge pull request #451 from thaJeztah/carry_add_ubuntu_20.04_focal_f…
b508289 
…ossa

Add Ubuntu 20.04 Focal Fossa
Upstream-commit: 97abcfd
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
@silvin-lubecki
Merge pull request docker-archive#451 from thaJeztah/carry_add_ubuntu…
97abcfd 
…_20.04_focal_fossa

Add Ubuntu 20.04 Focal Fossa
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@anshulpundir anshulpundir anshulpundir approved these changes

@dperny dperny Awaiting requested review from dperny

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.03.0
Development

Successfully merging this pull request may close these issues.
3 participants
@andrewhsu @thaJeztah @anshulpundir