diff --git a/VERSION b/VERSION index 2f2e08cfa3..d4ce82d5f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.0-dev +17.04.0-dev diff --git a/api/swagger.yaml b/api/swagger.yaml index c9d48b90f0..9398bb8ed8 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -44,7 +44,7 @@ info: The API is usually changed in each release of Docker, so API calls are versioned to ensure that clients don't break. - For Docker Engine 1.14, the API version is 1.27. To lock to this version, you prefix the URL with `/v1.27`. For example, calling `/info` is the same as calling `/v1.27/info`. + For Docker Engine 17.04, the API version is 1.27. To lock to this version, you prefix the URL with `/v1.27`. For example, calling `/info` is the same as calling `/v1.27/info`. Engine releases in the near future should support this version of the API, so your client will continue to work even if it is talking to a newer Engine. @@ -52,7 +52,7 @@ info: The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer Docker daemons. - This documentation is for version 1.27 of the API, which was introduced with Docker 1.14. Use this table to find documentation for previous versions of the API: + This documentation is for version 1.27 of the API, which was introduced with Docker 17.04. Use this table to find documentation for previous versions of the API: Docker version | API version | Changes ----------------|-------------|--------- @@ -1686,7 +1686,7 @@ definitions: NanoCPUs: 4000000000 MemoryBytes: 8272408576 Engine: - EngineVersion: "1.14.0" + EngineVersion: "17.04.0" Labels: foo: "bar" Plugins: @@ -5229,13 +5229,13 @@ paths: type: "string" examples: application/json: - Version: "1.14.0" + Version: "17.04.0" Os: "linux" KernelVersion: "3.19.0-23-generic" - GoVersion: "go1.6.3" + GoVersion: "go1.7.5" GitCommit: "deadbee" Arch: "amd64" - ApiVersion: "1.26" + ApiVersion: "1.27" MinAPIVersion: "1.12" BuildTime: "2016-06-14T07:09:13.444803460+00:00" Experimental: true diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 14c527d609..7d3c70263d 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -184,7 +184,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.14, use `=` instead.") + logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 17.04, use `=` instead.") } if len(con) != 2 { diff --git a/hack/make.ps1 b/hack/make.ps1 index b80e844ac2..1a1b7c5db9 100644 --- a/hack/make.ps1 +++ b/hack/make.ps1 @@ -353,7 +353,7 @@ Try { $gitCommit=Get-GitCommit if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' } - # Get the version of docker (eg 1.14.0-dev) + # Get the version of docker (eg 17.04.0-dev) $dockerVersion=Get-DockerVersion # Give a warning if we are not running in a container and are building binaries or running unit tests. diff --git a/hack/make/.go-autogen.ps1 b/hack/make/.go-autogen.ps1 index 3adc4c3e97..768badb6a5 100644 --- a/hack/make/.go-autogen.ps1 +++ b/hack/make/.go-autogen.ps1 @@ -9,7 +9,7 @@ The commit string. This is calculated externally to this script. .PARAMETER DockerVersion - The version such as 1.14.0-dev. This is calculated externally to this script. + The version such as 17.04.0-dev. This is calculated externally to this script. #> param(