Merge pull request #582 from docker/1.2.2-release

1.2.2 release
docker · May 4, 2015 · bef23fe · bef23fe
2 parents 0b78d7a + b8e950c
commit bef23fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/docker/client.py b/docker/client.py
@@ -898,7 +898,8 @@ def pull(self, repository, tag=None, stream=False,
                     # 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
@@ -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(".")])
diff --git 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
 -----