Merge pull request #29527 from allencloud/change-minor-mistake

change minor mistake of spelling
This commit is contained in:
Brian Goff 2016-12-21 13:15:00 -05:00 committed by GitHub
commit a4be350fb0
2 changed files with 2 additions and 2 deletions

View File

@ -11,7 +11,7 @@ import (
"github.com/spf13/cobra"
)
// NewLogoutCommand creates a new `docker login` command
// NewLogoutCommand creates a new `docker logout` command
func NewLogoutCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "logout [SERVER]",

View File

@ -277,7 +277,7 @@ func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error {
for _, label := range info.Labels {
stringSlice := strings.SplitN(label, "=", 2)
if len(stringSlice) > 1 {
// If there is a conflict we will throw out an warning
// If there is a conflict we will throw out a warning
if v, ok := labelMap[stringSlice[0]]; ok && v != stringSlice[1] {
fmt.Fprintln(dockerCli.Err(), "WARNING: labels with duplicate keys and conflicting values have been deprecated")
break