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.

Sign up for GitHub

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

Jump to bottom

[master] Vendor swarmkit #29117

Merged

cpuguy83 merged 1 commit into moby:master from AkihiroSuda:vendor-swarmkit

Dec 5, 2016

Member

AkihiroSuda commented Dec 5, 2016

Propagate manager removal error (Propagate manager removal error swarmkit#1790)
integration: Don't wait for dispatcher heartbeats to timeout (integration: Don't wait for dispatcher heartbeats to timeout swarmkit#1792)
simplify error (simplify error swarmkit#1783)
Fix race in ProcessRaftMessage logging (Fix race in ProcessRaftMessage logging swarmkit#1786)
raft: Avoid returning errors from ProcessRaftMessage (raft: Avoid returning errors from ProcessRaftMessage swarmkit#1779)
agent: Correct fix for pre-LogBroker managers (agent: Correct fix for pre-LogBroker managers swarmkit#1784)
updater: Change tests not to set StopGracePeriod (updater: Change tests not to set StopGracePeriod swarmkit#1745)
log: mark grpc messages with module (log: mark grpc messages with module swarmkit#1778)
Fix a goroutine misusage in the implementation of Worker.Subscribe() (Fix a goroutine misusage in the implementation of Worker.Subscribe() swarmkit#1775)
On leader switchover preserve the vxlan id for existing networks (On leader switchover preserve the vxlan id for existing networks swarmkit#1773)
Fixed misspelling (Fixed misspelling swarmkit#1774)
Ensuring root rotation works (Ensuring root rotation works swarmkit#1768)

cc @aaronlehmann


          Vendor swarmkit

Update swarmkit to deec7ba, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>

GordonTheTurtle added the status/0-triage label

AkihiroSuda mentioned this pull request

improve TestServiceLogs for the goroutine issue #28915 #28974

Merged

Member Author

AkihiroSuda commented Dec 5, 2016

Note: this vendoring is needed for merging PR (only contains IT) #28974 to master (then cherry-pick to 1.13)

aaronlehmann mentioned this pull request

Agent bounces session in mixed-version swarm #28496

Closed

aaronlehmann added status/2-code-review and removed status/0-triage labels

Contributor

aaronlehmann commented Dec 5, 2016

LGTM

cpuguy83 approved these changes

View reviewed changes

Member

cpuguy83 left a comment

LGTM

cpuguy83 merged commit 04cd199 into moby:master

GordonTheTurtle added this to the 1.14.0 milestone

aaronlehmann mentioned this pull request

Routing mesh problems in mixed version swarm #28493

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/2-code-review