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.

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

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

Merged
merged 3 commits into from
Jan 20, 2017
Merged

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

merged 3 commits into from
Jan 20, 2017

Commits on Jan 19, 2017

  1. Revert "Gracefully fail if Network and IPAM plugins are used" 

    This reverts commit 296fcfc.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
    @mavenugo
    mavenugo committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    f273618 View commit details
    Browse the repository at this point in the history

  2. Add plugingetter to swarm node config. 

    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)
    @anusha-ragunathan @mavenugo
    anusha-ragunathan authored and mavenugo committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    f9e0839 View commit details
    Browse the repository at this point in the history

  3. NetworkAllocator must make use of plugin-v2 

    Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit f250807)
Signed-off-by: Madhu Venugopal <madhu@docker.com>
    @mavenugo
    mavenugo committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    68808ba View commit details
    Browse the repository at this point in the history