From 7135afa79b4d99ba2a214fcc1c2decf95f850c2f Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 19 Jun 2016 09:53:31 -0700 Subject: [PATCH] Fix misspell typos Signed-off-by: nick --- api/client/utils.go | 2 +- daemon/cluster/executor/container/adapter.go | 4 ++-- daemon/cluster/executor/container/container.go | 2 +- daemon/cluster/provider/network.go | 2 +- daemon/oci_linux.go | 2 +- integration-cli/docker_cli_daemon_test.go | 8 ++++---- plugin/distribution/push.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/client/utils.go b/api/client/utils.go index 043444eae5..99b0f86189 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -134,7 +134,7 @@ func CopyToFile(outfile string, r io.Reader) error { return nil } -// ForwardAllSignals forwards signals to the contianer +// ForwardAllSignals forwards signals to the container // TODO: this can be unexported again once all container commands are under // api/client/container func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal { diff --git a/daemon/cluster/executor/container/adapter.go b/daemon/cluster/executor/container/adapter.go index 17bf903210..acbd37b64c 100644 --- a/daemon/cluster/executor/container/adapter.go +++ b/daemon/cluster/executor/container/adapter.go @@ -70,7 +70,7 @@ func (c *containerAdapter) pullImage(ctx context.Context) error { } return err } - // TOOD(stevvooe): Report this status somewhere. + // TODO(stevvooe): Report this status somewhere. logrus.Debugln("pull progress", m) } // if the final stream object contained an error, return it @@ -126,7 +126,7 @@ func (c *containerAdapter) create(ctx context.Context, backend executorpkg.Backe return err } - // Docker daemon currently doesnt support multiple networks in container create + // Docker daemon currently doesn't support multiple networks in container create // Connect to all other networks nc := c.container.connectNetworkingConfig() diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go index 07ca1b9579..c2a48c9824 100644 --- a/daemon/cluster/executor/container/container.go +++ b/daemon/cluster/executor/container/container.go @@ -19,7 +19,7 @@ import ( ) const ( - // Explictly use the kernel's default setting for CPU quota of 100ms. + // Explicitly use the kernel's default setting for CPU quota of 100ms. // https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt cpuQuotaPeriod = 100 * time.Millisecond diff --git a/daemon/cluster/provider/network.go b/daemon/cluster/provider/network.go index a383343d7c..d99c2f7294 100644 --- a/daemon/cluster/provider/network.go +++ b/daemon/cluster/provider/network.go @@ -13,7 +13,7 @@ type NetworkCreateResponse struct { ID string `json:"Id"` } -// VirtualAddress represents a virtual adress. +// VirtualAddress represents a virtual address. type VirtualAddress struct { IPv4 string IPv6 string diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 9492c17249..4459d02fca 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -459,7 +459,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c userMounts[m.Destination] = struct{}{} } - // Filter out mounts that are overriden by user supplied mounts + // Filter out mounts that are overridden by user supplied mounts var defaultMounts []specs.Mount _, mountDev := userMounts["/dev"] for _, m := range s.Mounts { diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index f5f05319c9..80cdbbcaaa 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -2408,7 +2408,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) { out, err := s.d.Cmd("run", "--rm", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) @@ -2491,7 +2491,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) { c.Assert(err, check.NotNil, check.Commentf(out)) c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) } @@ -2504,7 +2504,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) { out, err := s.d.Cmd("run", "--rm", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) @@ -2553,7 +2553,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) { c.Assert(err, check.NotNil, check.Commentf(out)) c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) } diff --git a/plugin/distribution/push.go b/plugin/distribution/push.go index 5041c00520..9cd400a70e 100644 --- a/plugin/distribution/push.go +++ b/plugin/distribution/push.go @@ -97,7 +97,7 @@ func Push(name string, rs registry.Service, metaHeader http.Header, authConfig * return "", err } // The canonical descriptor is set the mediatype again, just in case. - // Dont touch the digest or the size here. + // Don't touch the digest or the size here. desc.MediaType = mt logrus.Debugf("pushed blob: %s %s", desc.MediaType, desc.Digest) descs = append(descs, desc)