summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraiordache <anca.iordache@docker.com>2020-08-10 18:21:57 +0200
committeraiordache <anca.iordache@docker.com>2020-08-10 18:21:57 +0200
commit7db995b1ce94d8ec012793037acb789c17f95779 (patch)
tree2c153d89c1977f8791d8114db7d171b328fc9330
parent7e967c9e80bf606ea15795ed190fb0778a53954f (diff)
downloaddocker-py-4.3.0-release.tar.gz
Fix changelog merge4.3.0-release
Signed-off-by: aiordache <anca.iordache@docker.com>
-rw-r--r--docs/change-log.md6
1 files changed, 1 insertions, 5 deletions
diff --git a/docs/change-log.md b/docs/change-log.md
index 183ea9e..cecce9d 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -4,7 +4,7 @@ Change log
4.3.0
-----
-[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/66?closed=1)
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/64?closed=1)
### Features
- Add `DeviceRequest` type to expose host resources such as GPUs
@@ -51,10 +51,6 @@ Change log
- Add support for docker contexts through `docker.ContextAPI`
-<<<<<<< HEAD
-
-=======
->>>>>>> 7c4194c... Post release 4.2.0 update:
4.1.0
-----