From a06d5273b3cb72f68fc32da26955842287314970 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 25 Nov 2015 14:10:18 +0100 Subject: [PATCH] docs: move API changes to the correct API version These changes were made as part of https://github.com/docker/docker/pull/17478 but inadvertently added to the v1.21 API version. Also added a short description to the API changelog. Signed-off-by: Sebastiaan van Stijn --- docs/reference/api/docker_remote_api.md | 2 ++ docs/reference/api/docker_remote_api_v1.21.md | 2 -- docs/reference/api/docker_remote_api_v1.22.md | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/reference/api/docker_remote_api.md b/docs/reference/api/docker_remote_api.md index 2c8c4b1d3f..cdd0a08792 100644 --- a/docs/reference/api/docker_remote_api.md +++ b/docs/reference/api/docker_remote_api.md @@ -95,6 +95,8 @@ This section lists each version from latest to oldest. Each listing includes a [Docker Remote API v1.22](docker_remote_api_v1.22.md) documentation * `GET /containers/json` supports filter `isolation` on Windows. +* `GET /info` Now returns `Architecture` and `OSType` fields, providing information + about the host architecture and operating system type that the daemon runs on. * `GET /networks/(name)` now returns a `Name` field for each container attached to the network. ### v1.21 API changes diff --git a/docs/reference/api/docker_remote_api_v1.21.md b/docs/reference/api/docker_remote_api_v1.21.md index 641aab0a11..1c1f509403 100644 --- a/docs/reference/api/docker_remote_api_v1.21.md +++ b/docs/reference/api/docker_remote_api_v1.21.md @@ -1903,7 +1903,6 @@ Display system-wide information Content-Type: application/json { - "Architecture": "x86_64", "Containers": 11, "CpuCfsPeriod": true, "CpuCfsQuota": true, @@ -1935,7 +1934,6 @@ Display system-wide information "Name": "prod-server-42", "NoProxy": "9.81.1.160", "OomKillDisable": true, - "OSType": "linux", "OperatingSystem": "Boot2Docker", "RegistryConfig": { "IndexConfigs": { diff --git a/docs/reference/api/docker_remote_api_v1.22.md b/docs/reference/api/docker_remote_api_v1.22.md index 0b5ab269ee..cfb36406c7 100644 --- a/docs/reference/api/docker_remote_api_v1.22.md +++ b/docs/reference/api/docker_remote_api_v1.22.md @@ -1907,6 +1907,7 @@ Display system-wide information Content-Type: application/json { + "Architecture": "x86_64", "Containers": 11, "CpuCfsPeriod": true, "CpuCfsQuota": true, @@ -1948,6 +1949,7 @@ Display system-wide information "Name": "prod-server-42", "NoProxy": "9.81.1.160", "OomKillDisable": true, + "OSType": "linux", "OperatingSystem": "Boot2Docker", "RegistryConfig": { "IndexConfigs": {