Skip to content

[18.09] vndr docker/docker to docker/engine d2ecc7b#1339

Merged
andrewhsu merged 1 commit intodocker:18.09from
andrewhsu:vr
Sep 5, 2018
Merged

[18.09] vndr docker/docker to docker/engine d2ecc7b#1339
andrewhsu merged 1 commit intodocker:18.09from
andrewhsu:vr

Conversation

@andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Sep 5, 2018

- What I did

update docker/docker vndr to d2ecc7b of docker/engine 18.09 branch and the associated vndrs of the vendor.conf

for reference, comparison of upstream changes:

- How I did it

$ vi vendor.conf
$ make -f docker.Makefile shell
$ vndr github.com/docker/docker
$ # etc...

- How to verify it

$ make -f docker.Makefile vendor
...
2018/09/05 17:28:26 Success
2018/09/05 17:28:26 Running time: 1m57.858367535s
scripts/validate/check-git-diff vendor
vendor is correct

- Description for the changelog

  • Update docker/docker to docker/engine d2ecc7b

- A picture of a cute animal (not mandatory but encouraged)

🐳

@codecov-io
Copy link

codecov-io commented Sep 5, 2018

Codecov Report

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

@@          Coverage Diff          @@
##           18.09   #1339   +/-   ##
=====================================
  Coverage   54.6%   54.6%           
=====================================
  Files        294     294           
  Lines      19417   19417           
=====================================
  Hits       10602   10602           
  Misses      8149    8149           
  Partials     666     666

@andrewhsu andrewhsu changed the title [18.09] vndr docker/docker to docker/engine b8a4fe5 WIP [18.09] vndr docker/docker to docker/engine b8a4fe5 Sep 5, 2018
@andrewhsu andrewhsu changed the title WIP [18.09] vndr docker/docker to docker/engine b8a4fe5 WIP [18.09] vndr docker/docker to docker/engine d2ecc7b Sep 5, 2018
@andrewhsu andrewhsu changed the title WIP [18.09] vndr docker/docker to docker/engine d2ecc7b [18.09] vndr docker/docker to docker/engine d2ecc7b Sep 5, 2018
And update the associated packages that have also updated from
docker/docker vendor.conf.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
Copy link
Contributor Author

So much vndr

@thaJeztah
Copy link
Member

Did you check if there were corresponding vndr PR's in the docker/engine 18.09 branch? I tend to cherry-pick those vendor-bump PR's, which also allows me to double check if no local changes were associated and/or to make it easier to link related issues

@thaJeztah
Copy link
Member

Actually; ignore my previous comment. Not thinking straight due to queuing at the airport 😁😉

Copy link
Member

@thaJeztah thaJeztah 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 44371c7 into docker:18.09 Sep 5, 2018
@andrewhsu andrewhsu deleted the vr branch September 5, 2018 18:43
@thaJeztah thaJeztah added this to the 18.09.0 milestone Sep 11, 2018
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.

4 participants