summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-09-19 18:00:27 -0700
committerJoffrey F <joffrey@docker.com>2016-09-19 18:00:27 -0700
commit803ff5030e1977e49bca7feea02d74afeabd6356 (patch)
tree667374d98eec04fffc0fdbab0c2d86013a9f567c
parent1e939be5fb26ccd5f5b064d9dcd0732e1397ff47 (diff)
parentfc481c4cd15321251bb1eedbb5ea67187c606ace (diff)
downloaddocker-py-803ff5030e1977e49bca7feea02d74afeabd6356.tar.gz
Merge branch 'release'
-rw-r--r--docs/change_log.md39
-rw-r--r--requirements.txt2
-rw-r--r--setup.cfg2
-rw-r--r--setup.py2
4 files changed, 42 insertions, 3 deletions
diff --git a/docs/change_log.md b/docs/change_log.md
index d37e48f..e32df1e 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -1,6 +1,45 @@
Change Log
==========
+1.10.3
+------
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.10.3+is%3Aclosed)
+
+### Bugfixes
+
+* Fixed an issue where identity tokens in configuration files weren't handled
+ by the library.
+
+### Miscellaneous
+
+* Increased the default number of connection pools from 10 to 25. This number
+ can now be configured using the `num_pools` parameter in the `Client`
+ constructor.
+
+
+1.10.2
+------
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.10.0+is%3Aclosed)
+
+### Bugfixes
+
+* Updated the docker-pycreds dependency as it was causing issues for some
+ users with dependency resolution in applications using docker-py.
+
+
+1.10.1
+------
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.10.0+is%3Aclosed)
+
+### Bugfixes
+
+* The docker.utils.types module was removed in favor of docker.types, but some
+ applications imported it explicitly. It has been re-added with an import
+ warning advising to use the new module path.
+
1.10.0
------
diff --git a/requirements.txt b/requirements.txt
index 4c0d5c2..1e52846 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@ six>=1.4.0
websocket-client==0.32.0
backports.ssl_match_hostname>=3.5 ; python_version < '3.5'
ipaddress==1.0.16 ; python_version < '3.3'
-docker-pycreds==0.2.0 \ No newline at end of file
+docker-pycreds==0.2.1 \ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index ad388d2..00b8f37 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,4 +2,4 @@
universal = 1
[metadata]
-description_file = README.md
+description_file = README.rst
diff --git a/setup.py b/setup.py
index 1afd873..9233ac2 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ requirements = [
'requests >= 2.5.2, < 2.11',
'six >= 1.4.0',
'websocket-client >= 0.32.0',
- 'docker-pycreds >= 0.2.0'
+ 'docker-pycreds >= 0.2.1'
]
if sys.platform == 'win32':