Update deprecation versions for "email" and colon in "security options"

These features were originally scheduled
for removal in docker 1.13, but we changed
our deprecation policy to keep features
for three releases instead of two.

This updates the deprecation version
to match the deprecation policy.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2016-11-01 09:12:27 -07:00
parent e7e5e6138f
commit ac7d79389a
1 changed files with 2 additions and 2 deletions

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
} }