Merge pull request #31409 from yuexiao-wang/fix-version

'docker daemon' deprecation message doesn't use the new version
This commit is contained in:
Brian Goff 2017-03-02 22:02:09 -05:00 committed by GitHub
commit 1da02be7f5
1 changed files with 1 additions and 1 deletions

View File

@ -228,7 +228,7 @@ func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error {
fmt.Fprintf(dockerCli.Out(), " %s\n", attribute)
}
// TODO: Engine labels with duplicate keys has been deprecated in 1.13 and will be error out
// after 3 release cycles (1.16). For now, a WARNING will be generated. The following will
// after 3 release cycles (17.12). For now, a WARNING will be generated. The following will
// be removed eventually.
labelMap := map[string]string{}
for _, label := range info.Labels {