1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #7549 from vieux/fix_leftover

fix #7374 leftover
This commit is contained in:
Tibor Vass 2014-08-12 19:51:57 -04:00
commit 136631df46

View file

@ -58,7 +58,7 @@ func (daemon *Daemon) ContainerDestroy(job *engine.Job) engine.Status {
return job.Errorf("Could not kill running container, cannot remove - %v", err)
}
} else {
return job.Errorf("You cannot remove a running container. Stop the container before attempting removal or use -s or -k")
return job.Errorf("You cannot remove a running container. Stop the container before attempting removal or use -f")
}
}
if err := daemon.Destroy(container); err != nil {