Skip to content

Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2#33228

Closed
nishanttotla wants to merge 1 commit intomoby:masterfrom
nishanttotla:vendor-swarmkit-master
Closed

Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2#33228
nishanttotla wants to merge 1 commit intomoby:masterfrom
nishanttotla:vendor-swarmkit-master

Conversation

@nishanttotla
Copy link
Contributor

@nishanttotla nishanttotla commented May 16, 2017 •
edited
Loading

Changes in this vendoring:

$ git log --no-merges --oneline ae29cf24355ef2106b63884d2f9b0a6406e5a144..998a47fb9c2b727c8a48d372309af0b3032051e2
ca59883 Set packed=false for repeated integer fields
c05903c Vendor gogoprotobuf v0.4
d127e0d dispatcher: Ensure processUpdatesLock is unlocked
f951de9 Add unit test for predefined and swarm node-local networks
6b16b5f Vendoring libnetwork @37e20af
44fa30f Support predefined node networks for services
5507383 Swarm to support node-local networks
9f69874 Better Architecture comparison for Platform filter
950b3d0 Grpc change for network options in service spec

@nishanttotla nishanttotla force-pushed the vendor-swarmkit-master branch from 4faf52a to 2a59b5a Compare May 16, 2017 17:54
@nishanttotla nishanttotla changed the title Vendor swarmkit fc847d5ca4034c2a25c9a109a7345aa4edc84140 Vendor swarmkit a326f62b658aa2e301ab6ab809d702dbe889d040 May 16, 2017
@nishanttotla nishanttotla mentioned this pull request May 16, 2017
Merged
@nishanttotla nishanttotla changed the title Vendor swarmkit a326f62b658aa2e301ab6ab809d702dbe889d040 Vendor swarmkit feb448e839df56c23c219c9ee95674c4956bdc9b May 16, 2017
@nishanttotla nishanttotla force-pushed the vendor-swarmkit-master branch 2 times, most recently from a635828 to a78ae4e Compare May 16, 2017 21:25
@nishanttotla
Copy link
Contributor Author

nishanttotla commented May 16, 2017

cc @aboch

@nishanttotla
Vendor swarmkit 998a47f
7b45da8 
Signed-off-by: Nishant Totla <[email protected]>
@nishanttotla nishanttotla force-pushed the vendor-swarmkit-master branch from a78ae4e to 7b45da8 Compare May 16, 2017 22:01
@nishanttotla nishanttotla changed the title Vendor swarmkit feb448e839df56c23c219c9ee95674c4956bdc9b Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2 May 16, 2017
@aaronlehmann aaronlehmann added the status/failing-ci Indicates that the PR in its current state fails the test suite label May 16, 2017
@nishanttotla nishanttotla mentioned this pull request May 17, 2017
Merged
@nishanttotla
Copy link
Contributor Author

nishanttotla commented May 17, 2017 •
edited
Loading

CI is failing because libnetwork vendoring needs to be updated first. That is being done in #32981.

@aaronlehmann
Copy link

aaronlehmann commented May 17, 2017

Should we close this one in favor of #32981? It vendors the same revision of swarmkit.

Or if #32981 will take awhile, should we pull the libnetwork and gogoprotobuf vendoring into this one?

@nishanttotla
Copy link
Contributor Author

nishanttotla commented May 17, 2017

@aaronlehmann #32981 might take a while, though @aboch told me it's due before the freeze.

This current PR has the libnetwork and gogoproto, but CI will continue to fail without the libnetwork changes of #32981. I want to keep this one open just in case it's required at the last minute.

@nishanttotla
Copy link
Contributor Author

nishanttotla commented May 18, 2017

Closing this because #32981 will be merged soon.

@nishanttotla nishanttotla deleted the vendor-swarmkit-master branch May 18, 2017 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah Awaiting requested review from thaJeztah

@aaronlehmann aaronlehmann Awaiting requested review from aaronlehmann

Assignees

No one assigned

Labels

status/failing-ci Indicates that the PR in its current state fails the test suite status/2-code-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nishanttotla @aaronlehmann @vdemeester @GordonTheTurtle