Merge pull request #19165 from shishir-a412ed/man_page_fix

man page fix: remove -e/--exec-drive=native related description
This commit is contained in:
moxiegirl 2016-01-07 16:47:07 -08:00
commit 6213cc9d04
5 changed files with 2 additions and 12 deletions

View file

@ -603,8 +603,6 @@ Status Codes:
This endpoint returns a live stream of a container's resource usage statistics. This endpoint returns a live stream of a container's resource usage statistics.
> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
**Example request**: **Example request**:
GET /containers/redis1/stats HTTP/1.1 GET /containers/redis1/stats HTTP/1.1

View file

@ -620,8 +620,6 @@ Status Codes:
This endpoint returns a live stream of a container's resource usage statistics. This endpoint returns a live stream of a container's resource usage statistics.
> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
**Example request**: **Example request**:
GET /containers/redis1/stats HTTP/1.1 GET /containers/redis1/stats HTTP/1.1

View file

@ -633,8 +633,6 @@ Status Codes:
This endpoint returns a live stream of a container's resource usage statistics. This endpoint returns a live stream of a container's resource usage statistics.
> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
**Example request**: **Example request**:
GET /containers/redis1/stats HTTP/1.1 GET /containers/redis1/stats HTTP/1.1

View file

@ -698,8 +698,6 @@ Status Codes:
This endpoint returns a live stream of a container's resource usage statistics. This endpoint returns a live stream of a container's resource usage statistics.
> **Note**: this functionality currently only works when using the *libcontainer* exec-driver.
**Example request**: **Example request**:
GET /containers/redis1/stats HTTP/1.1 GET /containers/redis1/stats HTTP/1.1

View file

@ -226,10 +226,8 @@ inside it)
# EXEC DRIVER OPTIONS # EXEC DRIVER OPTIONS
Use the **--exec-opt** flags to specify options to the execution driver. The only Use the **--exec-opt** flags to specify options to the execution driver.
runtime that accepts any options is Linux. As a The following options are available:
result, you must also specify **-s=**native for this option to have effect. The
following is the only *native* option:
#### native.cgroupdriver #### native.cgroupdriver
Specifies the management of the container's `cgroups`. You can specify Specifies the management of the container's `cgroups`. You can specify