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

Merge pull request #2060 from allencloud/fix-typos 

fix typos
This commit is contained in:
Victor Vieux 2016-03-31 15:50:05 -07:00
parent 7c1dcadb98 07a47d54a4
commit 2906a670a3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/commands.go
View File

@ -35,7 +35,7 @@ var (
{ {
Name: "join", Name: "join",
ShortName: "j", ShortName: "j",
Usage: "join a docker cluster", Usage: "Join a docker cluster",
Flags: []cli.Flag{flJoinAdvertise, flHeartBeat, flTTL, flJoinRandomDelay, flDiscoveryOpt}, Flags: []cli.Flag{flJoinAdvertise, flHeartBeat, flTTL, flJoinRandomDelay, flDiscoveryOpt},
Action: join, Action: join,
}, },

2
cli/flags.go
View File

@ -59,7 +59,7 @@ var (
flTTL = cli.StringFlag{ flTTL = cli.StringFlag{
Name: "ttl", Name: "ttl",
Value: "180s", Value: "180s",
Usage: "sets the expiration of an ephemeral node", Usage: "set the expiration of an ephemeral node",
} }
flTimeout = cli.StringFlag{ flTimeout = cli.StringFlag{
Name: "timeout", Name: "timeout",

8
cluster/cluster.go
View File

@ -71,7 +71,7 @@ type Cluster interface {
// `status` is the current status, like "", "in progress" or "loaded" // `status` is the current status, like "", "in progress" or "loaded"
Load(imageReader io.Reader, callback func(what, status string, err error)) 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. // It is pretty open, so the implementation decides what to return.
Info() [][2]string Info() [][2]string
@ -91,12 +91,12 @@ type Cluster interface {
// Return a random engine // Return a random engine
RANDOMENGINE() (*Engine, error) RANDOMENGINE() (*Engine, error)
// RenameContainer rename a container // Rename a container
RenameContainer(container *Container, newName string) error RenameContainer(container *Container, newName string) error
// BuildImage build an image // Build an image
BuildImage(*types.ImageBuildOptions, io.Writer) error BuildImage(*types.ImageBuildOptions, io.Writer) error
// TagImage tag an image // Tag an image
TagImage(IDOrName string, repo string, tag string, force bool) error TagImage(IDOrName string, repo string, tag string, force bool) error
} }

2
cluster/mesos/cluster.go
View File

@ -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 // 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 // TODO: once 0.23 or 0.24 is released, remove all this block of code as it
// doesn't scale very well. // doesn't scale very well.