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

Added shutdown to desired-state docs for filter node/service ps
This commit is contained in:
Sven Dowideit 2016-08-02 13:05:47 -07:00 committed by GitHub
commit 1d8617a42b
4 changed files with 8 additions and 2 deletions

View file

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

View file

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

View file

@ -89,7 +89,7 @@ bg8c07zzg87di2mufeq51a2qp redis.7 redis redis:3.0.6 Running 9 minutes Ru
#### desired-state #### 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 ## Related information

View file

@ -87,7 +87,7 @@ ID NAME SERVICE IMAGE DESIRED STATE LAST S
#### desired-state #### 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 ## Related information