Merge pull request #1198 from docker/1.10.1-release1.10.1

1.10.1 release

4 files changed, 20 insertions, 2 deletions

diff --git a/docker/utils/types.py b/docker/utils/types.py
new file mode 100644
index 0000000..8098c47
--- /dev/null
+++ b/docker/utils/types.py
@@ -0,0 +1,7 @@
+# Compatibility module. See https://github.com/docker/docker-py/issues/1196
+
+import warnings
+
+from ..types import Ulimit, LogConfig  # flake8: noqa
+
+warnings.warn('docker.utils.types is now docker.types', ImportWarning)
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