Merge pull request #143 from thaJeztah/remove-email-flag

thaJeztah · web-flow · commit a0066a150be4 · 2017-06-02T08:56:07.000+02:00
Remove deprecated -e/--email flag from docker login
diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go
@@ -41,10 +41,6 @@ func NewLoginCommand(dockerCli command.Cli) *cobra.Command {
 	flags.StringVarP(&opts.user, "username", "u", "", "Username")
 	flags.StringVarP(&opts.password, "password", "p", "", "Password")
 
-	// Deprecated in 1.11: Should be removed in docker 17.06
-	flags.StringVarP(&opts.email, "email", "e", "", "Email")
-	flags.MarkDeprecated("email", "will be removed in 17.06.")
-
 	return cmd
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,6 @@ func NewLoginCommand(dockerCli command.Cli) *cobra.Command {`
`41`	`41`	`flags.StringVarP(&opts.user, "username", "u", "", "Username")`
`42`	`42`	`flags.StringVarP(&opts.password, "password", "p", "", "Password")`
`43`	`43`
`44`		`- // Deprecated in 1.11: Should be removed in docker 17.06`
`45`		`- flags.StringVarP(&opts.email, "email", "e", "", "Email")`
`46`		`- flags.MarkDeprecated("email", "will be removed in 17.06.")`
`47`		`-`
`48`	`44`	`return cmd`
`49`	`45`	`}`
`50`	`46`