From d9d2691146648f6a2ba81724815961cdb8a576a1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 8 Mar 2017 15:10:45 +0100 Subject: [PATCH] Merge pull request #31641 from amatsus/master Fix typo in CHANGELOG.md (cherry picked from commit 58e787602d85ee674164fb9dae1250d2c3e98da1) Signed-off-by: Sebastiaan van Stijn --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0db7acdb8..dfd4bc33ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,7 +69,7 @@ Upgrading from Docker 1.13.1 to 17.03.0 is expected to be simple and low-risk. * Fix a deadlock in docker logs [#30223](https://github.com/docker/docker/pull/30223) * Fix cpu spin waiting for log write events [#31070](https://github.com/docker/docker/pull/31070) -* Fix a possible crash when using journald [#31231](https://github.com/docker/docker/pull/31231) [#31263](https://github.com/docker/docker/pull/31231) +* Fix a possible crash when using journald [#31231](https://github.com/docker/docker/pull/31231) [#31263](https://github.com/docker/docker/pull/31263) * Fix a panic on close of nil channel [#31274](https://github.com/docker/docker/pull/31274) * Fix duplicate mount point for `--volumes-from` in `docker run` [#29563](https://github.com/docker/docker/pull/29563) * Fix `--cache-from` does not cache last step [#31189](https://github.com/docker/docker/pull/31189)