1. docker
  2. Commit e41a39dbae007b04e12504e75ef69fb1ae6ab7c9
Browse code

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>

Sebastiaan van Stijn authored on 2016/11/02 01:12:27
Showing 2 changed files
cli/command/registry/login.go
History View file @ e41a39d
... ... 
@@ -39,9 +39,9 @@ func NewLoginCommand(dockerCli *command.DockerCli) *cobra.Command {
39 39 
 	flags.StringVarP(&opts.user, "username", "u", "", "Username")
40 40 
 	flags.StringVarP(&opts.password, "password", "p", "", "Password")
41 41
42 
-	// Deprecated in 1.11: Should be removed in docker 1.13
42 
+	// Deprecated in 1.11: Should be removed in docker 1.14
43 43 
 	flags.StringVarP(&opts.email, "email", "e", "", "Email")
44 
-	flags.MarkDeprecated("email", "will be removed in 1.13.")
44 
+	flags.MarkDeprecated("email", "will be removed in 1.14.")
45 45
46 46 
 	return cmd
47 47 
 }
daemon/daemon_unix.go
History View file @ e41a39d
... ... 
@@ -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 {