Skip to content

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

Merged
aaronlehmann merged 3 commits into
moby:bump_v1.13.1from
mavenugo:1.13.1-plugin
Jan 20, 2017
Merged

aaronlehmann merged 3 commits into
moby:bump_v1.13.1from
mavenugo:1.13.1-plugin

Conversation

@mavenugo

Copy link
Copy Markdown
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
Copy Markdown
Contributor

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