summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2014-06-23 19:20:58 +0200
committerJoffrey F <joffrey@docker.com>2014-06-23 19:20:58 +0200
commitb62396053dbca94da1b8e5c745e4d3c1be9d5aa2 (patch)
treee381ed5e5aba6371c37ba98e28f614b4e3eb8a20
parentdc1020fa1138d1f287503fa4a8fb5a49e6a0b75a (diff)
downloaddocker-py-0.3.2-release.tar.gz
Updated changelog with last minute changes ; updated default API version in README.md0.3.2-release
-rw-r--r--ChangeLog.md2
-rw-r--r--README.md2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index 6f6fd92..6cfe5c2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -8,6 +8,7 @@ ChangeLog
* Added new methods `Client.get_image` and `Client.load_image`
(`docker save` and `docker load`)
* Added new method `Client.ping`
+* Added new method `Client.resize`
* `Client.build` can now be provided with a custom context using the
`custom_context` parameter.
* Added support for `memswap_limit` parameter in `create_container`
@@ -16,6 +17,7 @@ ChangeLog
* Added support for `timestamps` parameter in `logs`
* Added support for `dns_search` parameter in `start`
* Added support for `network_mode` parameter in `start`
+* Added support for `size` parameter in `containers`
* Added support for `volumes_from` and `dns` parameters in `start`. As of
API version >= 1.10, these parameters no longer belong to `create_container`
* `Client.logs` now uses the logs endpoint when API version is sufficient
diff --git a/README.md b/README.md
index 325a927..398cf63 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ a Docker daemon, simply do:
```python
c = docker.Client(base_url='unix://var/run/docker.sock',
- version='1.9',
+ version='1.12',
timeout=10)
```