From 0b99e53595bca7f090e404c08a87993b7ca9103c Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 4 May 2015 11:47:07 -0700 Subject: [PATCH 1/2] Bumped version --- docker/client.py | 3 ++- docker/version.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/client.py b/docker/client.py index d7285bb6..2d1349c0 100644 --- a/docker/client.py +++ b/docker/client.py @@ -898,7 +898,8 @@ class Client(requests.Session): # auth_config needs to be a dict in the format used by # auth.py username , password, serveraddress, email headers['X-Registry-Auth'] = auth.encode_header( - authcfg) + authcfg + ) else: headers['X-Registry-Auth'] = auth.encode_header(auth_config) diff --git a/docker/version.py b/docker/version.py index 98d05132..a57056b6 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "1.2.2-dev" +version = "1.2.2" version_info = tuple([int(d) for d in version.replace("-dev", "").split(".")]) From b8e950c09e14c0b11da02dd062e0ab833969ae75 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 4 May 2015 11:47:16 -0700 Subject: [PATCH 2/2] Updated changelog --- docs/change_log.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/change_log.md b/docs/change_log.md index d0611593..5bbbc938 100644 --- a/docs/change_log.md +++ b/docs/change_log.md @@ -1,6 +1,14 @@ Change Log ========== +1.2.2 +----- + +### Bugfixes + +* Fixed a bug where parameters passed to `Client.exec_resize` would be ignored (#576) +* Fixed a bug where auth config wouldn't be resolved properly in `Client.pull` (#577) + 1.2.1 -----