summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-04-28 10:44:46 -0700
committerJoffrey F <joffrey@docker.com>2015-04-28 10:48:09 -0700
commite5ce67e72f62326c008cc08cc9e41be9c367d5d3 (patch)
tree59b5e3c37665d230e03e997a09da4dfa49fa1b76
parentf6b816c2649c704e80899478f168b00a36034d29 (diff)
downloaddocker-py-1.2.1-release.tar.gz
Bumped version, changelog1.2.1-release
-rw-r--r--docker/version.py2
-rw-r--r--docs/change_log.md8
2 files changed, 9 insertions, 1 deletions
diff --git a/docker/version.py b/docker/version.py
index 4cec744..7d51a51 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.2.1-dev"
+version = "1.2.1"
version_info = tuple([int(d) for d in version.replace("-dev", "").split(".")])
diff --git a/docs/change_log.md b/docs/change_log.md
index 54da540..d061159 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -1,6 +1,14 @@
Change Log
==========
+1.2.1
+-----
+
+### Bugfixes
+
+* Fixed a bug where the check_resource decorator would break with some
+ argument-passing methods. (#573)
+
1.2.0
-----