summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-03-28 15:00:42 -0700
committerJoffrey F <joffrey@docker.com>2017-03-28 15:00:42 -0700
commitae65be045a5a1d69b8d5a193b3bfaf37bf13e7c6 (patch)
treeb503c366bd51d2dfa6fc1eedd5f0c0fd0a55bed8
parenta89faa454ae41647fd1810b3a69efc82e748f681 (diff)
downloaddocker-py-ae65be045a5a1d69b8d5a193b3bfaf37bf13e7c6.tar.gz
Bump version 2.2.1 ; update changelog
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--docker/version.py2
-rw-r--r--docs/change-log.md12
2 files changed, 13 insertions, 1 deletions
diff --git a/docker/version.py b/docker/version.py
index b2474bd..08c792b 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "2.2.0"
+version = "2.2.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 c04cd4b..5a8d788 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,6 +1,18 @@
Change log
==========
+2.2.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/31?closed=1)
+
+### Bugfixes
+
+* Fixed a bug where the `status_code` attribute of `APIError` exceptions would
+ not reflect the expected value.
+* Fixed an issue where the `events` method would time out unexpectedly if no
+ data was sent by the engine for a given amount of time.
+
2.2.0
-----