diff options
| author | Joffrey F <joffrey@docker.com> | 2015-06-24 22:58:56 +0200 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-06-24 22:58:56 +0200 |
| commit | 30fac5b8799a50fbe837a674de15408c001f3f0e (patch) | |
| tree | 89694b0f24797220bb4717cd6ba504bc602464d5 /docker/client.py | |
| parent | 772262fed0020621f5c589eb4a8688caf59af0db (diff) | |
| download | docker-py-30fac5b8799a50fbe837a674de15408c001f3f0e.tar.gz | |
Fix stop timeout bugfix_649
Diffstat (limited to 'docker/client.py')
| -rw-r--r-- | docker/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py index f63da50..8bcc419 100644 --- a/docker/client.py +++ b/docker/client.py @@ -1101,7 +1101,7 @@ class Client(requests.Session): url = self._url("/containers/{0}/stop".format(container)) res = self._post(url, params=params, - timeout=(timeout + self.timeout)) + timeout=(timeout + (self.timeout or 0))) self._raise_for_status(res) @check_resource |