From 7ab84e8daff48db2f2eb98443c2f2347e0a50db3 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 2 Aug 2016 13:05:47 -0700 Subject: [PATCH] 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) Signed-off-by: Tibor Vass Conflicts: docs/reference/api/docker_remote_api_v1.25.md --- docs/reference/api/docker_remote_api_v1.24.md | 3 +++ docs/reference/commandline/node_ps.md | 2 +- docs/reference/commandline/service_ps.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index 7bfd4072cd..1ff4b07b1d 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -4505,6 +4505,9 @@ List tasks - `id=` - `name=` - `service=` + - `node=` + - `label=key` or `label="key=value"` + - `desired-state=(running | shutdown | accepted)` **Status codes**: diff --git a/docs/reference/commandline/node_ps.md b/docs/reference/commandline/node_ps.md index d22498077e..06dc0c2489 100644 --- a/docs/reference/commandline/node_ps.md +++ b/docs/reference/commandline/node_ps.md @@ -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 diff --git a/docs/reference/commandline/service_ps.md b/docs/reference/commandline/service_ps.md index 0f5ae4ef48..b6ba56e13b 100644 --- a/docs/reference/commandline/service_ps.md +++ b/docs/reference/commandline/service_ps.md @@ -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