1. docker
  2. Commit 62091d021b6c40a679c5789b6e42f829c19f2028
Browse code

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

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

Conflicts:
docs/reference/api/docker_remote_api_v1.25.md

Sven Dowideit authored on 2016/08/03 05:05:47
Showing 3 changed files
docs/reference/api/docker_remote_api_v1.24.md
History View file @ 62091d0
... ... 
@@ -4505,6 +4505,9 @@ List tasks
4505 4505 
   - `id=<task id>`
4506 4506 
   - `name=<task name>`
4507 4507 
   - `service=<service name>`
4508 
+  - `node=<node id>`
4509 
+  - `label=key` or `label="key=value"`
4510 
+  - `desired-state=(running | shutdown | accepted)`
4508 4511
4509 4512 
 **Status codes**:
4510 4513
docs/reference/commandline/node_ps.md
History View file @ 62091d0
... ... 
@@ -91,7 +91,7 @@ bg8c07zzg87di2mufeq51a2qp  redis.7  redis    redis:3.0.6  Running 9 minutes   Ru
91 91
92 92 
 #### desired-state
93 93
94 
-The `desired-state` filter can take the values `running` and `accepted`.
94 
+The `desired-state` filter can take the values `running`, `shutdown`, and `accepted`.
95 95
96 96
97 97 
 ## Related information
docs/reference/commandline/service_ps.md
History View file @ 62091d0
... ... 
@@ -89,7 +89,7 @@ ID                         NAME      SERVICE  IMAGE        DESIRED STATE  LAST S
89 89
90 90 
 #### desired-state
91 91
92 
-The `desired-state` filter can take the values `running` and `accepted`.
92 
+The `desired-state` filter can take the values `running`, `shutdown`, and `accepted`.
93 93
94 94
95 95 
 ## Related information