Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27953 from thaJeztah/fix-deprecation-version 

Update deprecation versions for "email" and colon in "security options"
This commit is contained in:
Michael Crosby 2016-11-01 14:31:32 -07:00 committed by GitHub
parent 09caa1ae97 ac7d79389a
commit 3a5d54290d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/registry/login.go
View File

@ -39,9 +39,9 @@ func NewLoginCommand(dockerCli *command.DockerCli) *cobra.Command {
flags.StringVarP(&opts.user, "username", "u", "", "Username") flags.StringVarP(&opts.user, "username", "u", "", "Username")
flags.StringVarP(&opts.password, "password", "p", "", "Password") flags.StringVarP(&opts.password, "password", "p", "", "Password")
// Deprecated in 1.11: Should be removed in docker 1.13 // Deprecated in 1.11: Should be removed in docker 1.14
flags.StringVarP(&opts.email, "email", "e", "", "Email") flags.StringVarP(&opts.email, "email", "e", "", "Email")
flags.MarkDeprecated("email", "will be removed in 1.13.") flags.MarkDeprecated("email", "will be removed in 1.14.")
return cmd return cmd
} }