From 07a47d54a4198029c4ad78e2b1d7038b5711eda9 Mon Sep 17 00:00:00 2001 From: Sun Hongliang Date: Wed, 30 Mar 2016 19:53:23 +0800 Subject: [PATCH] fix typos Signed-off-by: Sun Hongliang --- cli/commands.go | 2 +- cli/flags.go | 2 +- cluster/cluster.go | 8 ++++---- cluster/mesos/cluster.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/commands.go b/cli/commands.go index cd848b3770..aeb2af7b71 100644 --- a/cli/commands.go +++ b/cli/commands.go @@ -35,7 +35,7 @@ var ( { Name: "join", ShortName: "j", - Usage: "join a docker cluster", + Usage: "Join a docker cluster", Flags: []cli.Flag{flJoinAdvertise, flHeartBeat, flTTL, flJoinRandomDelay, flDiscoveryOpt}, Action: join, }, diff --git a/cli/flags.go b/cli/flags.go index bfae7b9c51..f0099f7ea5 100644 --- a/cli/flags.go +++ b/cli/flags.go @@ -59,7 +59,7 @@ var ( flTTL = cli.StringFlag{ Name: "ttl", Value: "180s", - Usage: "sets the expiration of an ephemeral node", + Usage: "set the expiration of an ephemeral node", } flTimeout = cli.StringFlag{ Name: "timeout", diff --git a/cluster/cluster.go b/cluster/cluster.go index 67292a03ff..4c301c6e3b 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -71,7 +71,7 @@ type Cluster interface { // `status` is the current status, like "", "in progress" or "loaded" Load(imageReader io.Reader, callback func(what, status string, err error)) - // Return some info about the cluster, like nb or containers / images + // Return some info about the cluster, like nb of containers / images // It is pretty open, so the implementation decides what to return. Info() [][2]string @@ -91,12 +91,12 @@ type Cluster interface { // Return a random engine RANDOMENGINE() (*Engine, error) - // RenameContainer rename a container + // Rename a container RenameContainer(container *Container, newName string) error - // BuildImage build an image + // Build an image BuildImage(*types.ImageBuildOptions, io.Writer) error - // TagImage tag an image + // Tag an image TagImage(IDOrName string, repo string, tag string, force bool) error } diff --git a/cluster/mesos/cluster.go b/cluster/mesos/cluster.go index 43d356cbc6..fe66a84164 100644 --- a/cluster/mesos/cluster.go +++ b/cluster/mesos/cluster.go @@ -605,7 +605,7 @@ func (c *Cluster) LaunchTask(t *task.Task) bool { } } - log.Debug("Cannot parse docker info from task status, please upgrade Mesos to the last version") + log.Debug("Cannot parse docker info from task status, please upgrade Mesos to the latest version") // For mesos <= 0.22 we fallback to a full refresh + using labels // TODO: once 0.23 or 0.24 is released, remove all this block of code as it // doesn't scale very well.