From dceea17805258520b1218eb1a2bb394c8b9c0a03 Mon Sep 17 00:00:00 2001 From: Dan McPherson Date: Tue, 15 Apr 2014 17:35:36 -0400 Subject: [PATCH] Fixing typos Docker-DCO-1.1-Signed-off-by: Dan McPherson (github: danmcp) --- runtime/networkdriver/bridge/driver.go | 2 +- server/server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/networkdriver/bridge/driver.go b/runtime/networkdriver/bridge/driver.go index b8568c7c404c3..ee8d76d44756d 100644 --- a/runtime/networkdriver/bridge/driver.go +++ b/runtime/networkdriver/bridge/driver.go @@ -32,7 +32,7 @@ var ( // This is to use the same gateway IPs as the /24 ranges, which predate the /16 ranges. // In theory this shouldn't matter - in practice there's bound to be a few scripts relying // on the internal addressing or other stupid things like that. - // The shouldn't, but hey, let's not break them unless we really have to. + // They shouldn't, but hey, let's not break them unless we really have to. "172.17.42.1/16", // Don't use 172.16.0.0/16, it conflicts with EC2 DNS 172.16.0.23 "10.0.42.1/16", // Don't even try using the entire /8, that's too intrusive "10.1.42.1/16", diff --git a/server/server.go b/server/server.go index 2de7dbc872825..241a094a37e06 100644 --- a/server/server.go +++ b/server/server.go @@ -1277,7 +1277,7 @@ func (srv *Server) pullRepository(r *registry.Registry, out io.Writer, localName for _, ep := range repoData.Endpoints { out.Write(sf.FormatProgress(utils.TruncateID(img.ID), fmt.Sprintf("Pulling image (%s) from %s, endpoint: %s", img.Tag, localName, ep), nil)) if err := srv.pullImage(r, out, img.ID, ep, repoData.Tokens, sf); err != nil { - // Its not ideal that only the last error is returned, it would be better to concatenate the errors. + // It's not ideal that only the last error is returned, it would be better to concatenate the errors. // As the error is also given to the output stream the user will see the error. lastErr = err out.Write(sf.FormatProgress(utils.TruncateID(img.ID), fmt.Sprintf("Error pulling image (%s) from %s, endpoint: %s, %s", img.Tag, localName, ep, err), nil))