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

thaJeztah · thaJeztah · commit e41a39dbae00 · 2016-11-01T09:12:27.000-07:00
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 &lt;github@gone.nl&gt;
diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go
@@ -39,9 +39,9 @@ func NewLoginCommand(dockerCli *command.DockerCli) *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 1.13
+	// 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.13.")
+	flags.MarkDeprecated("email", "will be removed in 1.14.")
 
 	return cmd
 }
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
@@ -168,7 +168,7 @@ func parseSecurityOpt(container *container.Container, config *containertypes.Hos
 			con = strings.SplitN(opt, "=", 2)
 		} else if strings.Contains(opt, ":") {
 			con = strings.SplitN(opt, ":", 2)
-			logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.13, use `=` instead.")
+			logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.14, use `=` instead.")
 		}
 
 		if len(con) != 2 {

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func parseSecurityOpt(container container.Container, config containertypes.Hos`
`168`	`168`	`con = strings.SplitN(opt, "=", 2)`
`169`	`169`	`} else if strings.Contains(opt, ":") {`
`170`	`170`	`con = strings.SplitN(opt, ":", 2)`
`171`		- logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.13, use `=` instead.")
	`171`	+ logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.14, use `=` instead.")
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`if len(con) != 2 {`