Merge pull request #7580 from thaJeztah/forward_port_changelog

[master] forward-port "Bump 1.26.1"
2020-07-02 13:34:56 +02:00 · 2020-07-02 13:34:56 +02:00 · ea6c7cb5f4
parent 6862d774be 7728bf6c8b
commit ea6c7cb5f4
2 changed files with 14 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,19 @@
 Change log
 ==========

+1.26.1 (2020-06-30)
+-------------------
+
+### Features
+
+- Bump `docker-py` from 4.2.1 to 4.2.2
+
+### Bugs
+
+- 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)
 -------------------

--- a/script/run/run.sh
+++ b/script/run/run.sh
@ -15,7 +15,7 @@

 set -e

-VERSION="1.26.0"
+VERSION="1.26.1"
 IMAGE="docker/compose:$VERSION"