summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2018-04-25 18:02:59 -0700
committerJoffrey F <joffrey@docker.com>2018-04-25 18:02:59 -0700
commit2b82f9327ac7e6729e449969d564c56c2d9c1421 (patch)
treee0c959d850fa8a0d067c62535bb95db2c0e9ff44
parentd5693ed903217950f37c32ef6f35a1a0a10f55d9 (diff)
parente88751cb9a235f31ec946c199b952b69dcc4cc0b (diff)
downloaddocker-py-2b82f9327ac7e6729e449969d564c56c2d9c1421.tar.gz
Merge branch 'release'
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--docker/version.py2
-rw-r--r--docs/change-log.md34
2 files changed, 34 insertions, 2 deletions
diff --git a/docker/version.py b/docker/version.py
index c949131..8f6e651 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "3.3.0-dev"
+version = "3.3.0"
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 4715c52..0065c62 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,10 +1,42 @@
Change log
==========
+3.3.0
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/49?closed=1)
+
+### Features
+
+* Added support for `prune_builds` in `APIClient` and `DockerClient.images`
+* Added support for `ignore_removed` parameter in
+ `DockerClient.containers.list`
+
+### Bugfixes
+
+* Fixed an issue that caused builds to fail when an in-context Dockerfile
+ would be specified using its absolute path
+* Installation with pip 10.0.0 and above no longer fails
+* Connection timeout for `stop` and `restart` now gets properly adjusted to
+ allow for the operation to finish in the specified time
+* Improved docker credential store support on Windows
+
+3.2.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/50?closed=1)
+
+### Bugfixes
+
+* Fixed a bug with builds not properly identifying Dockerfile paths relative
+ to the build context
+* Fixed an issue where builds would raise a `ValueError` when attempting to
+ build with a Dockerfile on a different Windows drive.
+
3.2.0
-----
-[List of PRs/ issues for this release](https://github.com/docker/docker-py/milestone/45?closed=1)
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/45?closed=1)
### Features