diff options
author | Joffrey F <f.joffrey@gmail.com> | 2016-03-24 14:28:10 -0700 |
---|---|---|
committer | Joffrey F <f.joffrey@gmail.com> | 2016-03-24 14:28:10 -0700 |
commit | 01cf62b4a3563b827ec0ba70340ad5f062c88d68 (patch) | |
tree | 3fbec4f1f37b348fcf17abb2aec27c18a017fa2a | |
parent | 88c8ed862d9294e1f2fd039078c23ff78cfea064 (diff) | |
parent | 52347847602df738a7dfcba08409a76f9be5d876 (diff) | |
download | docker-py-01cf62b4a3563b827ec0ba70340ad5f062c88d68.tar.gz |
Merge pull request #1011 from tomleb/master
Specify default value of stop's timeout
-rw-r--r-- | docs/api.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/api.md b/docs/api.md index f4f1ad4..3b0eda6 100644 --- a/docs/api.md +++ b/docs/api.md @@ -962,7 +962,7 @@ Stops a container. Similar to the `docker stop` command. * container (str): The container to stop * timeout (int): Timeout in seconds to wait for the container to stop before -sending a `SIGKILL` +sending a `SIGKILL`. Default: 10 ## tag |