diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2014-10-30 15:11:24 +0100 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2014-10-30 15:11:24 +0100 |
| commit | 22ac1ec23483aeafd645c560cdf69655619b757f (patch) | |
| tree | d09fcc0d969c2ea117849fce27f2601316e6e44c | |
| parent | e7f5766f3063235e254d95561659306e346f98f6 (diff) | |
| parent | 35e6892c71ecb8902047cdf95792d21e6f8dfcfb (diff) | |
| download | docker-py-22ac1ec23483aeafd645c560cdf69655619b757f.tar.gz | |
Merge pull request #319 from psftw/bugfix_history
Make history() return json.
| -rw-r--r-- | docker/client.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/client.py b/docker/client.py index 47ca4cd..6611162 100644 --- a/docker/client.py +++ b/docker/client.py @@ -613,8 +613,7 @@ class Client(requests.Session): def history(self, image): res = self._get(self._url("/images/{0}/history".format(image))) - self._raise_for_status(res) - return self._result(res) + return self._result(res, True) def images(self, name=None, quiet=False, all=False, viz=False): if viz: |