5 Commits

Author	SHA1	Message	Date
yupengzte	a532e48c46	fix the type ... Signed-off-by: yupengzte <yu.peng36@zte.com.cn> Upstream-commit: d735972d3150fa4e286ce468f033156fa22fddb7 Component: engine	2017-02-14 09:54:27 +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
Vincent Demeester	f6ad06ceb6	Add some unit tests to the node and swarm cli code ... Start work on adding unit tests to our cli code in order to have to write less costly integration test. Signed-off-by: Vincent Demeester <vincent@sbr.pm> Upstream-commit: f151c297eb268e22dc1eb36ded0e356885f40739 Component: engine	2017-01-09 18:30:15 +01:00
allencloud	486047481e	change join node role judge ... Signed-off-by: allencloud <allen.sun@daocloud.io> Upstream-commit: e41c0370b4714892201728e0544b007e5e9f1b27 Component: engine	2016-10-19 19:47:42 +08: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