Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop

Disable automatic killing of containers when docker stop fails
This commit is contained in:
Guillaume J. Charmes
2014-03-18 11:28:42 -07:00
4 changed files with 10 additions and 18 deletions
@@ -432,7 +432,7 @@ Stop a container
HTTP/1.1 204 OK
:query t: number of seconds to wait before killing the container
:query t: number of seconds to wait for the container to stop
:statuscode 204: no error
:statuscode 404: no such container
:statuscode 500: server error
@@ -457,7 +457,7 @@ Restart a container
HTTP/1.1 204 OK
:query t: number of seconds to wait before killing the container
:query t: number of seconds to wait for the container to stop
:statuscode 204: no error
:statuscode 404: no such container
:statuscode 500: server error