From 41d72e28c3444b97278df0b011adf7bb6764cf24 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 15 Jun 2016 17:57:59 -0400 Subject: [PATCH] Change SCALE to REPLICAS. Signed-off-by: Daniel Nephin (cherry picked from commit 4df03499486a7f62f94bd1fb8e2625b0ef932fe5) --- api/client/service/list.go | 2 +- api/client/service/scale.go | 2 +- docs/swarm/swarm-tutorial/deploy-service.md | 4 ++-- experimental/docker-stacks.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/client/service/list.go b/api/client/service/list.go index c1246c86d5..aba1a53cdb 100644 --- a/api/client/service/list.go +++ b/api/client/service/list.go @@ -71,7 +71,7 @@ func printTable(out io.Writer, services []swarm.Service) { // Ignore flushing errors defer writer.Flush() - fmt.Fprintf(writer, listItemFmt, "ID", "NAME", "SCALE", "IMAGE", "COMMAND") + fmt.Fprintf(writer, listItemFmt, "ID", "NAME", "REPLICAS", "IMAGE", "COMMAND") for _, service := range services { scale := "" if service.Spec.Mode.Replicated != nil && service.Spec.Mode.Replicated.Replicas != nil { diff --git a/api/client/service/scale.go b/api/client/service/scale.go index ae528b55d3..2962f29091 100644 --- a/api/client/service/scale.go +++ b/api/client/service/scale.go @@ -14,7 +14,7 @@ import ( func newScaleCommand(dockerCli *client.DockerCli) *cobra.Command { return &cobra.Command{ - Use: "scale SERVICE=SCALE [SERVICE=SCALE...]", + Use: "scale SERVICE=REPLICAS [SERVICE=REPLICAS...]", Short: "Scale one or multiple services", Args: scaleArgs, RunE: func(cmd *cobra.Command, args []string) error { diff --git a/docs/swarm/swarm-tutorial/deploy-service.md b/docs/swarm/swarm-tutorial/deploy-service.md index cbfc5affa7..5f32c16a60 100644 --- a/docs/swarm/swarm-tutorial/deploy-service.md +++ b/docs/swarm/swarm-tutorial/deploy-service.md @@ -39,8 +39,8 @@ example, the tutorial uses a machine named `manager1`. ``` $ docker service ls - ID NAME SCALE IMAGE COMMAND - 2zs4helqu64f helloworld 1 alpine ping docker.com + ID NAME REPLICAS IMAGE COMMAND + 2zs4helqu64f helloworld 1 alpine ping docker.com ``` ## What's next? diff --git a/experimental/docker-stacks.md b/experimental/docker-stacks.md index 31a02b6f54..83ee31654a 100644 --- a/experimental/docker-stacks.md +++ b/experimental/docker-stacks.md @@ -64,7 +64,7 @@ We can verify that services were correctly created: ```bash # docker service ls - ID NAME SCALE IMAGE + ID NAME REPLICAS IMAGE COMMAND 29bv0vnlm903 vossibility-stack_lookupd 1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqlookupd 4awt47624qwh vossibility-stack_nsqd 1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqd --data-path=/data --lookupd-tcp-address=lookupd:4160