Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make `--dispatcher-heartbeat-period` a duration 

Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
This commit is contained in:
Arnaud Porterie (icecrime) 2016-06-14 17:36:37 -07:00 committed by Tibor Vass
parent 49023a1c5f
commit 96150d3faa
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/bash/docker
View File

@ -1641,7 +1641,7 @@ _docker_swarm_join() {
_docker_swarm_update() { _docker_swarm_update() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "--auto-accept --dispatcher-heartbeat-period --help --secret --task-history-limit" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--auto-accept --dispatcher-heartbeat --help --secret --task-history-limit" -- "$cur" ) )
;; ;;
esac esac
} }

5
docs/reference/commandline/swarm_update.md
View File

@ -17,10 +17,11 @@ parent = "smn_cli"
update the Swarm. update the Swarm.
Options: Options:
--auto-accept value Acceptance policy (default [worker,manager]) --auto-accept value Auto acceptance policy (worker, manager or none)
--dispatcher-heartbeat duration Dispatcher heartbeat period (default 5s)
--help Print usage --help Print usage
--secret string Set secret value needed to accept nodes into cluster --secret string Set secret value needed to accept nodes into cluster
--task-history-limit int Task history retention limit (default 10)
Updates a Swarm cluster with new parameter values. This command must target a manager node. Updates a Swarm cluster with new parameter values. This command must target a manager node.