Skip to content

Commit

Permalink
Merge pull request #9933 from cpuguy83/fix_api_docs_for_info
Browse files Browse the repository at this point in the history
doc: Update API docs to reflect correct values for /info
  • Loading branch information
SvenDowideit committed Jan 7, 2015
2 parents 91509bf + cc3bf34 commit f65b781
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion docs/sources/reference/api/docker_remote_api_v1.16.md
Original file line number Diff line number Diff line change
Expand Up @@ -1223,6 +1223,7 @@ Display system-wide information
"Containers":11,
"Images":16,
"Driver":"btrfs",
"DriverStatus": [[""]],
"ExecutionDriver":"native-0.1",
"KernelVersion":"3.12.0-1-amd64"
"NCPU":1,
Expand All @@ -1234,11 +1235,14 @@ Display system-wide information
"NGoroutines":21,
"NEventsListener":0,
"InitPath":"/usr/bin/docker",
"InitSha1":"",
"IndexServerAddress":["https://index.docker.io/v1/"],
"MemoryLimit":true,
"SwapLimit":false,
"IPv4Forwarding":true,
"Labels":["storage=ssd"]
"Labels":["storage=ssd"],
"DockerRootDir": "/var/lib/docker",
"OperatingSystem": "Boot2Docker",
}

Status Codes:
Expand Down
6 changes: 5 additions & 1 deletion docs/sources/reference/api/docker_remote_api_v1.17.md
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,7 @@ Display system-wide information
"Containers":11,
"Images":16,
"Driver":"btrfs",
"DriverStatus": [[""]],
"ExecutionDriver":"native-0.1",
"KernelVersion":"3.12.0-1-amd64"
"NCPU":1,
Expand All @@ -1248,11 +1249,14 @@ Display system-wide information
"NGoroutines":21,
"NEventsListener":0,
"InitPath":"/usr/bin/docker",
"InitSha1":"",
"IndexServerAddress":["https://index.docker.io/v1/"],
"MemoryLimit":true,
"SwapLimit":false,
"IPv4Forwarding":true,
"Labels":["storage=ssd"]
"Labels":["storage=ssd"],
"DockerRootDir": "/var/lib/docker",
"OperatingSystem": "Boot2Docker",
}

Status Codes:
Expand Down

0 comments on commit f65b781

Please sign in to comment.