5 Commits

Author	SHA1	Message	Date
Aaron Lehmann	0827ead1b6	Revise swarm init/update flags, add unlocking capability ... - Neither swarm init or swarm update should take an unlock key - Add an autolock flag to turn on autolock - Make the necessary docker api changes - Add SwarmGetUnlockKey API call and use it when turning on autolock - Add swarm unlock-key subcommand Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> Upstream-commit: 0f9fc54df9274327ed22f4e07f0981a648e0278a Component: engine	2016-11-09 16:09:00 -08:00
Tonis Tiigi	2874df7efa	Add support for swarm init lock and swarm unlock ... Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: b4a667c8c4f536445d35e8914a58e8c749f16ea6 Component: engine	2016-11-09 16:09:00 -08:00
yuexiao-wang	457e448f9f	Remove some redundant consts ... Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn> Upstream-commit: 6b412d4fd30afe2a24f66839a6c26fbc94b01493 Component: engine	2016-11-02 16:42:42 +08:00
Yong Tang	562ec15f92	Let swarmkit handle cluster defaults in swarm init if not specified ... This fix tries to address the issue raised in 24958 where previously `docker swarm init` will automatically fill in all the default value (instead of letting swarmkit to handle the default). This fix update the `swarm init` so that initial value are passed only when a flag change has been detected. This fix fixes 24958. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402 Component: engine	2016-09-27 04:19:38 -07:00
Daniel Nephin	d8acc366ce	Move api/client -> cli/command ... Using gomvpkg -from github.com/docker/docker/api/client -to github.com/docker/docker/cli/command -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}' Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd Component: engine	2016-09-08 15:46:29 -04:00