From 31d969c6297c20b59318679cf43d7bb152b67b52 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Wed, 1 Jul 2020 15:07:30 +0200 Subject: [PATCH 1/2] Bump docker-compose 1.26.1 Signed-off-by: Ulysses Souza --- _config.yml | 2 +- _config_authoring.yml | 2 +- compose/release-notes.md | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 577366f98978..3e60f7333a08 100644 --- a/_config.yml +++ b/_config.yml @@ -23,7 +23,7 @@ google_analytics: GTM-WL2QLG5 latest_engine_api_version: "1.40" docker_ce_version: "19.03" -compose_version: "1.26.0" +compose_version: "1.26.1" compose_file_v3: "3.8" compose_file_v2: "2.4" machine_version: "0.16.0" diff --git a/_config_authoring.yml b/_config_authoring.yml index e6f6f967ff29..854caa360f27 100644 --- a/_config_authoring.yml +++ b/_config_authoring.yml @@ -21,7 +21,7 @@ exclude: ["_scripts", "tests", "apidocs/layouts", "Gemfile", "hooks", "index.htm latest_engine_api_version: "1.40" docker_ce_version: "19.03" -compose_version: "1.26.0" +compose_version: "1.26.1" compose_file_v3: "3.8" compose_file_v2: "2.4" machine_version: "0.16.0" diff --git a/compose/release-notes.md b/compose/release-notes.md index ba0133025bea..a6b337682243 100644 --- a/compose/release-notes.md +++ b/compose/release-notes.md @@ -7,6 +7,19 @@ redirect_from: - /release-notes/docker-compose/ --- +## 1.26.1 +(2020-06-30) + +### Features + +- Bump `docker-py` from 4.2.1 to 4.2.2 + +### Bug fixes + +- Enforce `docker-py` 4.2.1 as minimum version when installing with pip + +- Fix context load for non-docker endpoints + ## 1.26.0 (2020-06-03) From 237750fbc9c0c74ddd3fc45d916ad60e757174d1 Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Wed, 1 Jul 2020 15:14:32 +0100 Subject: [PATCH 2/2] Minor style updates --- compose/release-notes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/release-notes.md b/compose/release-notes.md index a6b337682243..ea4fbcbf1d8a 100644 --- a/compose/release-notes.md +++ b/compose/release-notes.md @@ -12,13 +12,13 @@ redirect_from: ### Features -- Bump `docker-py` from 4.2.1 to 4.2.2 +- Bumped `docker-py` from 4.2.1 to 4.2.2. ### Bug fixes -- Enforce `docker-py` 4.2.1 as minimum version when installing with pip +- Enforced `docker-py` 4.2.1 as minimum version when installing with pip. -- Fix context load for non-docker endpoints +- Fixed context load for non-docker endpoints. ## 1.26.0 (2020-06-03)