Merge pull request #28322 from Microsoft/jjh/api1.26

Bump API to v1.26
This commit is contained in:
Sebastiaan van Stijn 2016-11-17 00:01:46 +01:00 committed by GitHub
commit 6e6b37b0a2
2 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@ Package client is a Go client for the Docker Remote API.
The "docker" command uses this package to communicate with the daemon. It can also The "docker" command uses this package to communicate with the daemon. It can also
be used by your own Go applications to do anything the command-line interface does be used by your own Go applications to do anything the command-line interface does
 running containers, pulling images, managing swarms, etc. - running containers, pulling images, managing swarms, etc.
For more information about the Remote API, see the documentation: For more information about the Remote API, see the documentation:
https://docs.docker.com/engine/reference/api/docker_remote_api/ https://docs.docker.com/engine/reference/api/docker_remote_api/
@ -58,7 +58,7 @@ import (
) )
// DefaultVersion is the version of the current stable API // DefaultVersion is the version of the current stable API
const DefaultVersion string = "1.25" const DefaultVersion string = "1.26"
// Client is the API client that performs all operations // Client is the API client that performs all operations
// against a docker server. // against a docker server.

View File

@ -165,7 +165,7 @@ func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResp
// daemon on Windows where the daemon is listening on a named pipe // daemon on Windows where the daemon is listening on a named pipe
// `//./pipe/docker_engine, and the client must be running elevated. // `//./pipe/docker_engine, and the client must be running elevated.
// Give users a clue rather than the not-overly useful message // Give users a clue rather than the not-overly useful message
// such as `error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.25/info: // such as `error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.26/info:
// open //./pipe/docker_engine: The system cannot find the file specified.`. // open //./pipe/docker_engine: The system cannot find the file specified.`.
// Note we can't string compare "The system cannot find the file specified" as // Note we can't string compare "The system cannot find the file specified" as
// this is localised - for example in French the error would be // this is localised - for example in French the error would be