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

Conversation

@cyli
Copy link
Contributor

@cyli cyli commented Jun 8, 2017

@andrewhsu andrewhsu mentioned this pull request Jun 8, 2017
40 tasks
@cyli cyli changed the title WIP: [17.06] Re-vendor swarmkit [17.06] Re-vendor swarmkit Jun 9, 2017
@thaJeztah
Copy link
Member

should we bump moby master as well?

@andrewhsu
Copy link
Contributor

LGTM

@andrewhsu andrewhsu merged commit a9a1a9c into docker-archive:17.06 Jun 10, 2017
@cyli
Copy link
Contributor Author

cyli commented Jun 10, 2017

@thaJeztah Yes, I'll submit a PR for that.

@cyli cyli deleted the re-vendor-swarmkit branch June 10, 2017 02:04
@mlaventure
Copy link
Contributor

@cyli Does this require a line in the changelog? If so, could you provide one?

@cyli
Copy link
Contributor Author

cyli commented Jun 12, 2017

@mlaventure Do you mean a changelog between rc2 and rc3, or changelog between 17.05 and 17.06?

@mlaventure
Copy link
Contributor

@cyli since 17.05 we don't do inter-rc changelogs.

If what was fixed wasn't present in 17.05 then no entry is needed.

@cyli
Copy link
Contributor Author

cyli commented Jun 12, 2017

@mlaventure: moby/swarmkit#2233 was a fix for something that was in 17.05 I think: Maybe something like "fixed possible orchestration panic in mixed version clusters"?

cc @aaronlehmann

@aaronlehmann
Copy link

SGTM

@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
andrewhsu added a commit that referenced this pull request Aug 31, 2017
Adds ppc64le builds for ubuntu zesty
Upstream-commit: 093ae20
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 5, 2018
[18.09] client: dial tls on Dialer if tls config is set
Upstream-commit: d2ecc7bad104139c118249ad159b45315a022754
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants