Skip to content

Cherry-picking #1876 and reverts #1856 in 1.13.0 branch - #1882

Closed
mavenugo wants to merge 3 commits into
moby:bump_v1.13.0from
mavenugo:1.13.1-plugin
Closed

mavenugo wants to merge 3 commits into
moby:bump_v1.13.0from
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.x release.

@aaronlehmann

Copy link
Copy Markdown
Contributor

These shouldn't go into the 1.13.0 branch. We need to start a 1.13.1 branch.

@mavenugo

Copy link
Copy Markdown
Contributor Author

@aaronlehmann okay. I will push it to 1.13.1 branch once I have it.

@mavenugo mavenugo closed this Jan 19, 2017
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>
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.

4 participants