From 5c0d2a0932afb1e9c9e26326a22fdbefa1069463 Mon Sep 17 00:00:00 2001 From: Xiaoxi He Date: Fri, 7 Sep 2018 11:26:04 +0800 Subject: [PATCH] Fix some typos Signed-off-by: Xiaoxi He --- CHANGELOG.md | 2 +- api/types/stats.go | 2 +- cmd/dockerd/daemon.go | 2 +- integration/service/create_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fec9269b79..83fb9f4f09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -99,7 +99,7 @@ be found. * Add `--format` option to `docker node ls` [#30424](https://github.com/docker/docker/pull/30424) * Add `--prune` option to `docker stack deploy` to remove services that are no longer defined in the docker-compose file [#31302](https://github.com/docker/docker/pull/31302) * Add `PORTS` column for `docker service ls` when using `ingress` mode [#30813](https://github.com/docker/docker/pull/30813) -- Fix unnescessary re-deploying of tasks when environment-variables are used [#32364](https://github.com/docker/docker/pull/32364) +- Fix unnecessary re-deploying of tasks when environment-variables are used [#32364](https://github.com/docker/docker/pull/32364) - Fix `docker stack deploy` not supporting `endpoint_mode` when deploying from a docker compose file [#32333](https://github.com/docker/docker/pull/32333) - Proceed with startup if cluster component cannot be created to allow recovering from a broken swarm setup [#31631](https://github.com/docker/docker/pull/31631) diff --git a/api/types/stats.go b/api/types/stats.go index 60175c0613..9dc73431f3 100644 --- a/api/types/stats.go +++ b/api/types/stats.go @@ -120,7 +120,7 @@ type NetworkStats struct { RxBytes uint64 `json:"rx_bytes"` // Packets received. Windows and Linux. RxPackets uint64 `json:"rx_packets"` - // Received errors. Not used on Windows. Note that we dont `omitempty` this + // Received errors. Not used on Windows. Note that we don't `omitempty` this // field as it is expected in the >=v1.21 API stats structure. RxErrors uint64 `json:"rx_errors"` // Incoming packets dropped. Windows and Linux. diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index 01da5de81d..b46ee08121 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -180,7 +180,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) { d.StoreHosts(hosts) - // validate after NewDaemon has restored enabled plugins. Dont change order. + // validate after NewDaemon has restored enabled plugins. Don't change order. if err := validateAuthzPlugins(cli.Config.AuthorizationPlugins, pluginStore); err != nil { return errors.Wrap(err, "failed to validate authorization plugin") } diff --git a/integration/service/create_test.go b/integration/service/create_test.go index a89ae0a172..384ca335e4 100644 --- a/integration/service/create_test.go +++ b/integration/service/create_test.go @@ -135,7 +135,7 @@ func TestCreateWithDuplicateNetworkNames(t *testing.T) { network.WithDriver("bridge"), ) - // Dupliates with name but with different driver + // Duplicates with name but with different driver n3 := network.CreateNoError(t, context.Background(), client, name, network.WithDriver("overlay"), )