Skip to content

Commit

Permalink
Merge pull request moby#35738 from thaJeztah/bump-api-version
Browse files Browse the repository at this point in the history
Bump API version to 1.36
  • Loading branch information
thaJeztah authored Dec 9, 2017
2 parents 967224c + c1e982f commit 3b14e59
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion api/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package api
// Common constants for daemon and client.
const (
// DefaultVersion of Current REST API
DefaultVersion string = "1.35"
DefaultVersion string = "1.36"

// NoBaseImageSpecifier is the symbol used by the FROM
// command to specify that no base image is to be used.
Expand Down
8 changes: 4 additions & 4 deletions api/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ produces:
consumes:
- "application/json"
- "text/plain"
basePath: "/v1.35"
basePath: "/v1.36"
info:
title: "Docker Engine API"
version: "1.35"
version: "1.36"
x-logo:
url: "https://docs.docker.com/images/logo-docker-main.png"
description: |
Expand All @@ -49,8 +49,8 @@ info:
the URL is not supported by the daemon, a HTTP `400 Bad Request` error message
is returned.
If you omit the version-prefix, the current version of the API (v1.35) is used.
For example, calling `/info` is the same as calling `/v1.35/info`. Using the
If you omit the version-prefix, the current version of the API (v1.36) is used.
For example, calling `/info` is the same as calling `/v1.36/info`. Using the
API without a version-prefix is deprecated and will be removed in a future release.
Engine releases in the near future should support this version of the API,
Expand Down
5 changes: 5 additions & 0 deletions docs/api/version-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ keywords: "API, Docker, rcli, REST, documentation"
will be rejected.
-->

## v1.36 API changes

[Docker Engine API v1.36](https://docs.docker.com/engine/api/v1.36/) documentation


## v1.35 API changes

[Docker Engine API v1.35](https://docs.docker.com/engine/api/v1.35/) documentation
Expand Down

0 comments on commit 3b14e59

Please sign in to comment.