summaryrefslogtreecommitdiff
path: root/docker/api
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2017-03-28 15:53:46 -0700
committerGitHub <noreply@github.com>2017-03-28 15:53:46 -0700
commit599aa1a89a1e9d6905f6133595062a8e3b58025d (patch)
tree77e591bbaccca11afe1d4638c21888cc56d96181 /docker/api
parentb474ea2fd6357a3abd3942e589001f41cb6b3f6b (diff)
parent4a51e787318ad81331815c99e1a575892cf36e4b (diff)
downloaddocker-py-2.2.1.tar.gz
Merge pull request #1536 from docker/2.2.1-release2.2.1
2.2.1 release
Diffstat (limited to 'docker/api')
-rw-r--r--docker/api/daemon.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/api/daemon.py b/docker/api/daemon.py
index 00367bc..91c777f 100644
--- a/docker/api/daemon.py
+++ b/docker/api/daemon.py
@@ -68,9 +68,10 @@ class DaemonApiMixin(object):
'until': until,
'filters': filters
}
+ url = self._url('/events')
return self._stream_helper(
- self._get(self._url('/events'), params=params, stream=True),
+ self._get(url, params=params, stream=True, timeout=None),
decode=decode
)