Merge pull request #1011 from tomleb/master

Specify default value of stop's timeout

Merge pull request #1011 from tomleb/master
Specify default value of stop's timeout
01cf62b4 · Joffrey F · 88c8ed86 · 52347847 · 01cf62b4
Kaydet (Commit) 01cf62b4 authored Mar 24, 2016 tarafından Joffrey F
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

api.md docs/api.md +1 -1

No files found.
--- 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