6 Commits

Author	SHA1	Message	Date
Tibor Vass	58b37acff7	Merge pull request #30145 from anusha-ragunathan/ps-swarm ... Pass plugingetter as part of swarm node config. Upstream-commit: 2b89356c07b1824041985386d0c9485e49d9b987 Component: engine	2017-01-20 10:35:49 -08:00
Anusha Ragunathan	b01d142fdf	Pass plugingetter as part of 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> Upstream-commit: fa784951ba0a29d436c60b7465167b5ef188d084 Component: engine	2017-01-19 17:11:12 -08:00
Nishant Totla	ce34ab60cd	Make Docker automatically update hostname for Swarm node ... Signed-off-by: Nishant Totla <nishanttotla@gmail.com> Upstream-commit: 8de8b1d520d4d60ccc813121f0c718b98efdc220 Component: engine	2017-01-18 15:55:53 -08:00
Yong Tang	9a5d4b9c8d	Allow swarm join with --availability=drain ... This fix tries to address the issue raised in 24596 where it was not possible to join as manager only (`--availability=drain`). This fix adds a new flag `--availability` to `swarm join`. Related documentation has been updated. An integration test has been added. NOTE: Additional pull request for swarmkit and engine-api will be created separately. This fix fixes 24596. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Upstream-commit: a8e7e37aa82d1adac67b05836ea97a06fbdfdbf0 Component: engine	2017-01-10 16:31:51 -08:00
allencloud	ed60722124	not export errors and forbid leave when unlocked ... Signed-off-by: allencloud <allen.sun@daocloud.io> Upstream-commit: 7bdd1a4f9c06ab4af8e652b7483104456e72c442 Component: engine	2016-12-07 13:25:34 +08:00
Tonis Tiigi	bcb5d5d669	Switch cluster locking strategy ... Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: b7ea1bdb0227a789a15e23821b8db4d5ddceb26e Component: engine	2016-11-30 14:59:12 -08:00