beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #25241 from jhorwit2/jah/ps-doc-fix

Browse source 
Added shutdown to desired-state docs for filter node/service ps
(cherry picked from commit 1d8617a42b)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
This commit is contained in:
Sven Dowideit 2016-08-02 13:05:47 -07:00 committed by Tibor Vass
parent 5f38d112fc
commit 7ab84e8daf
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/reference/api/docker_remote_api_v1.24.md
View file

@ -4505,6 +4505,9 @@ List tasks
- `id=<task id>`
- `name=<task name>`
- `service=<service name>`
- `node=<node id>`
- `label=key` or `label="key=value"`
- `desired-state=(running | shutdown | accepted)`
**Status codes**:

2
docs/reference/commandline/node_ps.md
View file

@ -91,7 +91,7 @@ bg8c07zzg87di2mufeq51a2qp redis.7 redis redis:3.0.6 Running 9 minutes Ru
#### desired-state
The `desired-state` filter can take the values `running` and `accepted`.
The `desired-state` filter can take the values `running`, `shutdown`, and `accepted`.
## Related information

2
docs/reference/commandline/service_ps.md
View file

@ -89,7 +89,7 @@ ID NAME SERVICE IMAGE DESIRED STATE LAST S
#### desired-state
The `desired-state` filter can take the values `running` and `accepted`.
The `desired-state` filter can take the values `running`, `shutdown`, and `accepted`.
## Related information