Merge pull request #26868 from Microsoft/jjh/deprecateemail

1.14 deprecation: email from login
This commit is contained in:
Sebastiaan van Stijn 2016-11-15 13:08:05 +01:00 committed by GitHub
commit 66d50e5695
1 changed files with 0 additions and 5 deletions

View File

@ -35,14 +35,9 @@ func NewLoginCommand(dockerCli *command.DockerCli) *cobra.Command {
} }
flags := cmd.Flags() flags := cmd.Flags()
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.14
flags.StringVarP(&opts.email, "email", "e", "", "Email")
flags.MarkDeprecated("email", "will be removed in 1.14.")
return cmd return cmd
} }