summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-09-09 16:55:10 -0700
committerJoffrey F <joffrey@docker.com>2016-09-09 16:55:10 -0700
commit7167189486cb9bbb8148b80ee6fa5e53e655fca4 (patch)
tree31f0ac5620e724839d2e6edb04421fe68ae16848
parente045331e321e69fc09260121700448565ad717d0 (diff)
downloaddocker-py-7167189486cb9bbb8148b80ee6fa5e53e655fca4.tar.gz
Bump version + Update Changelog
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--docker/version.py2
-rw-r--r--docs/change_log.md11
-rw-r--r--setup.cfg2
3 files changed, 13 insertions, 2 deletions
diff --git a/docker/version.py b/docker/version.py
index 40accf1..1bc9811 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.10.0"
+version = "1.10.1"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/docs/change_log.md b/docs/change_log.md
index d37e48f..0ef2787 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -1,6 +1,17 @@
Change Log
==========
+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/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