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

[17.06] backport (swarmkit) cluster update and memory issue fixes #114

Merged
merged 1 commit into from Jul 13, 2017

Conversation

Projects
None yet
3 participants
@cyli
Contributor

cyli commented Jul 12, 2017

Bring in fixes on docker/swarmkit bump_v17.06.1 branch at git commit docker/swarmkit@fbccf06:

  • docker/swarmkit#2281 - fixes an issue where some cluster updates
    could be missed if a manager receives a catch-up snapshot from another manager
  • docker/swarmkit#2300 - fixes a possible memory issue if an
    external CA sends an overlarge response

Note, this PR is a cherry-pick from https://github.com/docker/swarmkit/tree/bump_v17.06.1, which has one extra commit that enables that branch to pass CI (because vndr version changed) but which is not needed for this repo.

cc @aaronlehmann @andrewhsu @thaJeztah

Bump swarmkit vendor in order to include the following changes:
- docker/swarmkit#2281 - fixes an issue where some cluster updates
  could be missed if a manager receives a catch-up snapshot from another manager
- docker/swarmkit#2300 - fixes a possible memory issue if an
  external CA sends an overlarge response

Signed-off-by: Ying <ying.li@docker.com>
@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann Jul 12, 2017

Contributor

LGTM

Contributor

aaronlehmann commented Jul 12, 2017

LGTM

@andrewhsu andrewhsu added this to the 17.06.1 milestone Jul 12, 2017

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 13, 2017

Collaborator

LGTM

Collaborator

andrewhsu commented Jul 13, 2017

LGTM

@andrewhsu andrewhsu merged commit fb319d1 into docker:17.06 Jul 13, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 175 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 169 has succeeded
Details
dco-signed All commits are signed

@cyli cyli deleted the cyli:re-vendor-swarmkit branch Jul 13, 2017

docker-jenkins pushed a commit that referenced this pull request Jun 12, 2018

Merge pull request #114 from thaJeztah/bump_golang_1.10.3
Bump Golang to 1.10.3
Upstream-commit: 0e26700e872244086288bd45426b37d5734a9ab7
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment