Browse code
docs: fix incorrect output for "/info" endpoint
OomScoreAjd is not part of `/info` output
Wrong field name `DiscoveryBackend` in API reference
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Arnaud Porterie authored on 2016/03/15 01:13:08Showing 3 changed files
- docs/reference/api/docker_remote_api_v1.21.md
- docs/reference/api/docker_remote_api_v1.22.md
- docs/reference/api/docker_remote_api_v1.23.md
| ... | ... |
@@ -1921,11 +1921,11 @@ Display system-wide information |
| 1921 | 1921 |
Content-Type: application/json |
| 1922 | 1922 |
|
| 1923 | 1923 |
{
|
| 1924 |
+ "ClusterStore": "etcd://localhost:2379", |
|
| 1924 | 1925 |
"Containers": 11, |
| 1925 | 1926 |
"CpuCfsPeriod": true, |
| 1926 | 1927 |
"CpuCfsQuota": true, |
| 1927 | 1928 |
"Debug": false, |
| 1928 |
- "DiscoveryBackend": "etcd://localhost:2379", |
|
| 1929 | 1929 |
"DockerRootDir": "/var/lib/docker", |
| 1930 | 1930 |
"Driver": "btrfs", |
| 1931 | 1931 |
"DriverStatus": [[""]], |
| ... | ... |
@@ -1966,9 +1966,9 @@ Display system-wide information |
| 1966 | 1966 |
"127.0.0.0/8" |
| 1967 | 1967 |
] |
| 1968 | 1968 |
}, |
| 1969 |
+ "ServerVersion": "1.9.0", |
|
| 1969 | 1970 |
"SwapLimit": false, |
| 1970 | 1971 |
"SystemTime": "2015-03-10T11:11:23.730591467-07:00" |
| 1971 |
- "ServerVersion": "1.9.0" |
|
| 1972 | 1972 |
} |
| 1973 | 1973 |
|
| 1974 | 1974 |
Status Codes: |
| ... | ... |
@@ -2796,7 +2796,7 @@ JSON Parameters: |
| 2796 | 2796 |
|
| 2797 | 2797 |
`POST /networks/(id)/connect` |
| 2798 | 2798 |
|
| 2799 |
-Connects a container to a network |
|
| 2799 |
+Connect a container to a network |
|
| 2800 | 2800 |
|
| 2801 | 2801 |
**Example request**: |
| 2802 | 2802 |
|
| ... | ... |
@@ -2827,7 +2827,7 @@ JSON Parameters: |
| 2827 | 2827 |
|
| 2828 | 2828 |
`POST /networks/(id)/disconnect` |
| 2829 | 2829 |
|
| 2830 |
-Disconnects a container from a network |
|
| 2830 |
+Disconnect a container from a network |
|
| 2831 | 2831 |
|
| 2832 | 2832 |
**Example request**: |
| 2833 | 2833 |
|
| ... | ... |
@@ -2133,6 +2133,7 @@ Display system-wide information |
| 2133 | 2133 |
|
| 2134 | 2134 |
{
|
| 2135 | 2135 |
"Architecture": "x86_64", |
| 2136 |
+ "ClusterStore": "etcd://localhost:2379", |
|
| 2136 | 2137 |
"Containers": 11, |
| 2137 | 2138 |
"ContainersRunning": 7, |
| 2138 | 2139 |
"ContainersStopped": 3, |
| ... | ... |
@@ -2140,21 +2141,9 @@ Display system-wide information |
| 2140 | 2140 |
"CpuCfsPeriod": true, |
| 2141 | 2141 |
"CpuCfsQuota": true, |
| 2142 | 2142 |
"Debug": false, |
| 2143 |
- "DiscoveryBackend": "etcd://localhost:2379", |
|
| 2144 | 2143 |
"DockerRootDir": "/var/lib/docker", |
| 2145 | 2144 |
"Driver": "btrfs", |
| 2146 | 2145 |
"DriverStatus": [[""]], |
| 2147 |
- "SystemStatus": [["State", "Healthy"]], |
|
| 2148 |
- "Plugins": {
|
|
| 2149 |
- "Volume": [ |
|
| 2150 |
- "local" |
|
| 2151 |
- ], |
|
| 2152 |
- "Network": [ |
|
| 2153 |
- "null", |
|
| 2154 |
- "host", |
|
| 2155 |
- "bridge" |
|
| 2156 |
- ] |
|
| 2157 |
- }, |
|
| 2158 | 2146 |
"ExecutionDriver": "native-0.1", |
| 2159 | 2147 |
"ExperimentalBuild": false, |
| 2160 | 2148 |
"HttpProxy": "http://test:test@localhost:8080", |
| ... | ... |
@@ -2179,8 +2168,17 @@ Display system-wide information |
| 2179 | 2179 |
"NoProxy": "9.81.1.160", |
| 2180 | 2180 |
"OomKillDisable": true, |
| 2181 | 2181 |
"OSType": "linux", |
| 2182 |
- "OomScoreAdj": 500, |
|
| 2183 | 2182 |
"OperatingSystem": "Boot2Docker", |
| 2183 |
+ "Plugins": {
|
|
| 2184 |
+ "Volume": [ |
|
| 2185 |
+ "local" |
|
| 2186 |
+ ], |
|
| 2187 |
+ "Network": [ |
|
| 2188 |
+ "null", |
|
| 2189 |
+ "host", |
|
| 2190 |
+ "bridge" |
|
| 2191 |
+ ] |
|
| 2192 |
+ }, |
|
| 2184 | 2193 |
"RegistryConfig": {
|
| 2185 | 2194 |
"IndexConfigs": {
|
| 2186 | 2195 |
"docker.io": {
|
| ... | ... |
@@ -2194,9 +2192,10 @@ Display system-wide information |
| 2194 | 2194 |
"127.0.0.0/8" |
| 2195 | 2195 |
] |
| 2196 | 2196 |
}, |
| 2197 |
+ "ServerVersion": "1.9.0", |
|
| 2197 | 2198 |
"SwapLimit": false, |
| 2199 |
+ "SystemStatus": [["State", "Healthy"]], |
|
| 2198 | 2200 |
"SystemTime": "2015-03-10T11:11:23.730591467-07:00" |
| 2199 |
- "ServerVersion": "1.9.0" |
|
| 2200 | 2201 |
} |
| 2201 | 2202 |
|
| 2202 | 2203 |
Status Codes: |
| ... | ... |
@@ -3089,7 +3088,7 @@ JSON Parameters: |
| 3089 | 3089 |
|
| 3090 | 3090 |
`POST /networks/(id)/connect` |
| 3091 | 3091 |
|
| 3092 |
-Connects a container to a network |
|
| 3092 |
+Connect a container to a network |
|
| 3093 | 3093 |
|
| 3094 | 3094 |
**Example request**: |
| 3095 | 3095 |
|
| ... | ... |
@@ -3126,7 +3125,7 @@ JSON Parameters: |
| 3126 | 3126 |
|
| 3127 | 3127 |
`POST /networks/(id)/disconnect` |
| 3128 | 3128 |
|
| 3129 |
-Disconnects a container from a network |
|
| 3129 |
+Disconnect a container from a network |
|
| 3130 | 3130 |
|
| 3131 | 3131 |
**Example request**: |
| 3132 | 3132 |
|
| ... | ... |
@@ -2167,6 +2167,7 @@ Display system-wide information |
| 2167 | 2167 |
|
| 2168 | 2168 |
{
|
| 2169 | 2169 |
"Architecture": "x86_64", |
| 2170 |
+ "ClusterStore": "etcd://localhost:2379", |
|
| 2170 | 2171 |
"CgroupDriver": "cgroupfs", |
| 2171 | 2172 |
"Containers": 11, |
| 2172 | 2173 |
"ContainersRunning": 7, |
| ... | ... |
@@ -2175,21 +2176,9 @@ Display system-wide information |
| 2175 | 2175 |
"CpuCfsPeriod": true, |
| 2176 | 2176 |
"CpuCfsQuota": true, |
| 2177 | 2177 |
"Debug": false, |
| 2178 |
- "DiscoveryBackend": "etcd://localhost:2379", |
|
| 2179 | 2178 |
"DockerRootDir": "/var/lib/docker", |
| 2180 | 2179 |
"Driver": "btrfs", |
| 2181 | 2180 |
"DriverStatus": [[""]], |
| 2182 |
- "SystemStatus": [["State", "Healthy"]], |
|
| 2183 |
- "Plugins": {
|
|
| 2184 |
- "Volume": [ |
|
| 2185 |
- "local" |
|
| 2186 |
- ], |
|
| 2187 |
- "Network": [ |
|
| 2188 |
- "null", |
|
| 2189 |
- "host", |
|
| 2190 |
- "bridge" |
|
| 2191 |
- ] |
|
| 2192 |
- }, |
|
| 2193 | 2181 |
"ExecutionDriver": "native-0.1", |
| 2194 | 2182 |
"ExperimentalBuild": false, |
| 2195 | 2183 |
"HttpProxy": "http://test:test@localhost:8080", |
| ... | ... |
@@ -2215,8 +2204,17 @@ Display system-wide information |
| 2215 | 2215 |
"NoProxy": "9.81.1.160", |
| 2216 | 2216 |
"OomKillDisable": true, |
| 2217 | 2217 |
"OSType": "linux", |
| 2218 |
- "OomScoreAdj": 500, |
|
| 2219 | 2218 |
"OperatingSystem": "Boot2Docker", |
| 2219 |
+ "Plugins": {
|
|
| 2220 |
+ "Volume": [ |
|
| 2221 |
+ "local" |
|
| 2222 |
+ ], |
|
| 2223 |
+ "Network": [ |
|
| 2224 |
+ "null", |
|
| 2225 |
+ "host", |
|
| 2226 |
+ "bridge" |
|
| 2227 |
+ ] |
|
| 2228 |
+ }, |
|
| 2220 | 2229 |
"RegistryConfig": {
|
| 2221 | 2230 |
"IndexConfigs": {
|
| 2222 | 2231 |
"docker.io": {
|
| ... | ... |
@@ -2230,9 +2228,10 @@ Display system-wide information |
| 2230 | 2230 |
"127.0.0.0/8" |
| 2231 | 2231 |
] |
| 2232 | 2232 |
}, |
| 2233 |
+ "ServerVersion": "1.9.0", |
|
| 2233 | 2234 |
"SwapLimit": false, |
| 2235 |
+ "SystemStatus": [["State", "Healthy"]], |
|
| 2234 | 2236 |
"SystemTime": "2015-03-10T11:11:23.730591467-07:00" |
| 2235 |
- "ServerVersion": "1.9.0" |
|
| 2236 | 2237 |
} |
| 2237 | 2238 |
|
| 2238 | 2239 |
Status Codes: |