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

Merge pull request #24125 from vdemeester/24117-node-task-filter

Browse source 
Fix --filter=desired_state behaviour
This commit is contained in:
Tibor Vass 2016-06-30 14:08:05 -07:00 committed by GitHub
commit 9d18fda08d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/node/tasks.go
View file

@ -55,7 +55,7 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
filter := opts.filter.Value() filter := opts.filter.Value()
filter.Add("node", node.ID) filter.Add("node", node.ID)
if !opts.all { if !opts.all && !filter.Include("desired_state") {
filter.Add("desired_state", string(swarm.TaskStateRunning)) filter.Add("desired_state", string(swarm.TaskStateRunning))
filter.Add("desired_state", string(swarm.TaskStateAccepted)) filter.Add("desired_state", string(swarm.TaskStateAccepted))