summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-08-22 16:38:15 -0700
committerJoffrey F <f.joffrey@gmail.com>2017-08-22 17:00:11 -0700
commite9fe07768145d848fd67c8d84b7766bd39ec5e38 (patch)
tree6e00e89a713e67e955a67fc03efecf46130afd41
parent0c2b4e4d3aa15efbf2cfac68571e7506ea86b8c9 (diff)
downloaddocker-py-e9fe07768145d848fd67c8d84b7766bd39ec5e38.tar.gz
Bump 2.5.12.5.1
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 3b899fb..273270d 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "2.6.0-dev"
+version = "2.5.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 199e5ce..9fe15e1 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,6 +1,18 @@
Change log
==========
+2.5.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/37?closed=1)
+
+### Bugfixes
+
+* Fixed a bug where patterns ending with `**` in `.dockerignore` would
+ raise an exception
+* Fixed a bug where using `attach` with the `stream` argument set to `False`
+ would raise an exception
+
2.5.0
-----