From 1bb38f1a2ba772cea25ba97070c4dee461068c9f Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Fri, 22 Jul 2016 19:07:10 -0700 Subject: [PATCH] Update --update-parallelism docs Update documentation to account for the changes in #24952. docs/swarm/swarm-tutorial/rolling-update.md doesn't need any changes, but the CLI reference pages should show the current help text. drain-node.md no longer needs to specify --update-parallelism 1 in its example. Signed-off-by: Aaron Lehmann (cherry picked from commit 933ba8d7f7f95ad0bac97c39ffb3cdf1a5634cc6) Signed-off-by: Tibor Vass --- docs/reference/commandline/service_create.md | 2 +- docs/reference/commandline/service_update.md | 2 +- docs/swarm/swarm-tutorial/drain-node.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index 550f1f9b97..3f3cffa313 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -42,7 +42,7 @@ Options: --restart-window value Window used to evaluate the restart policy (default none) --stop-grace-period value Time to wait before force killing a container (default none) --update-delay duration Delay between updates - --update-parallelism uint Maximum number of tasks updated simultaneously + --update-parallelism uint Maximum number of tasks updated simultaneously (0 to update all at once) (default 1) -u, --user string Username or UID --with-registry-auth Send registry authentication details to Swarm agents -w, --workdir string Working directory inside the container diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md index 0044d024bf..17e834fc7d 100644 --- a/docs/reference/commandline/service_update.md +++ b/docs/reference/commandline/service_update.md @@ -48,7 +48,7 @@ Options: --restart-window value Window used to evaluate the restart policy (default none) --stop-grace-period value Time to wait before force killing a container (default none) --update-delay duration Delay between updates - --update-parallelism uint Maximum number of tasks updated simultaneously + --update-parallelism uint Maximum number of tasks updated simultaneously (0 to update all at once) (default 1) -u, --user string Username or UID --with-registry-auth Send registry authentication details to Swarm agents -w, --workdir string Working directory inside the container diff --git a/docs/swarm/swarm-tutorial/drain-node.md b/docs/swarm/swarm-tutorial/drain-node.md index b55548b066..03fa712f4f 100644 --- a/docs/swarm/swarm-tutorial/drain-node.md +++ b/docs/swarm/swarm-tutorial/drain-node.md @@ -41,7 +41,7 @@ run your manager node. For example, the tutorial uses a machine named update](rolling-update.md) tutorial, start it now: ```bash - $ docker service create --replicas 3 --name redis --update-delay 10s --update-parallelism 1 redis:3.0.6 + $ docker service create --replicas 3 --name redis --update-delay 10s redis:3.0.6 c5uo6kdmzpon37mgj9mwglcfw ```