From 7728bf6c8bfe28b2b9a35d5b3f5634a099371602 Mon Sep 17 00:00:00 2001
From: Ulysses Souza <ulyssessouza@gmail.com>
Date: Tue, 30 Jun 2020 19:28:59 +0200
Subject: [PATCH] [master] forward-port "Bump 1.26.1"

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
(cherry picked from commit f216ddbf05c131058cb11323023f8b43cd381926)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 CHANGELOG.md      | 13 +++++++++++++
 script/run/run.sh |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 432f1745e..2e7a6bbf0 100644
--- 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)
 -------------------
 
diff --git a/script/run/run.sh b/script/run/run.sh
index 65fb656ad..f7be36b60 100755
--- 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"