toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33465 from ChenMin46/fix_typos

Browse Source 
Fix Typos: continer,contianer -> container
Upstream-commit: 9fbcec6219aad74201da428b0b12141b5c812609
Component: engine
This commit is contained in:
Doug Davis
2017-06-01 13:52:18 +09:00
committed by GitHub
parent 61ed140656 02f992f2b8
commit b289cb3026
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/client/container_wait.go
View File

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types/versions"
)
// ContainerWait waits until the specified continer is in a certain state
// ContainerWait waits until the specified container is in a certain state
// indicated by the given condition, either "not-running" (default),
// "next-exit", or "removed".
//

2
components/engine/container/state.go
View File

@ -180,7 +180,7 @@ const (
WaitConditionRemoved
)
// Wait waits until the continer is in a certain state indicated by the given
// Wait waits until the container is in a certain state indicated by the given
// condition. A context must be used for cancelling the request, controlling
// timeouts, and avoiding goroutine leaks. Wait must be called without holding
// the state lock. Returns a channel from which the caller will receive the

2
components/engine/integration-cli/docker_cli_swarm_test.go
View File

@ -448,7 +448,7 @@ func (s *DockerSwarmSuite) TestOverlayAttachableReleaseResourcesOnFailure(c *che
out, err = d.Cmd("run", "-d", "--network", "ovnet", "--name", "c1", "--ip", "10.10.9.33", "busybox", "top")
c.Assert(err, checker.IsNil, check.Commentf(out))
// Attempt to attach another contianer with same IP, must fail
// Attempt to attach another container with same IP, must fail
_, err = d.Cmd("run", "-d", "--network", "ovnet", "--name", "c2", "--ip", "10.10.9.33", "busybox", "top")
c.Assert(err, checker.NotNil)