Merge pull request docker#582 from docker/1.2.2-release

1.2.2 release

Author: shin-

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)
 

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(".")])

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
 -----