Skip to content
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

Cherry-picking #1876 and reverts #1856 in 1.13.1 branch #1883

Merged
merged 3 commits into from
Jan 20, 2017

Conversation

mavenugo
Copy link
Contributor

Cherry-picking #1876 and reverts #1856 in 1.13.0 branch in order to bring in network plugin support into 1.13.1 release.

mavenugo and others added 3 commits January 19, 2017 13:51
This reverts commit 296fcfc.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
This is necessary for swarmkit to support cluster wide plugins, such as
globally scoped network plugins.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
(cherry picked from commit 7541809)
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit f250807)
Signed-off-by: Madhu Venugopal <madhu@docker.com>
@aaronlehmann aaronlehmann added this to the 1.13.1 milestone Jan 19, 2017
@aaronlehmann
Copy link
Collaborator

LGTM

@aaronlehmann aaronlehmann merged commit 0692326 into moby:bump_v1.13.1 Jan 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants