From 7c55ded8bb99ebdf7e39e6a6026a1838ab05aa99 Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 19:02:20 +0000
Subject: [PATCH] v20.10.40

---
 .versionbot/CHANGELOG.yml | 27 +++++++++++++++++++++++++++
 CHANGELOG.md              |  6 ++++++
 VERSION                   |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index c9282b6e23..b52ac6ded0 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,30 @@
+- commits:
+    - subject: Re-vendor to get the containerd-shim-runc-v2 sources
+      hash: 155b7771ff14a9dc9abf65f34bdf716baac04481
+      body: |
+        Including changes we did to make it work with balenaEngine's amalgamated
+        binary.
+      footer:
+        Signed-off-by: Leandro Motta Barros <leandro@balena.io>
+        signed-off-by: Leandro Motta Barros <leandro@balena.io>
+        Change-type: patch
+        change-type: patch
+      author: Leandro Motta Barros
+      nested: []
+    - subject: Default to io.containerd.runc.v2
+      hash: cd0ca50fe417e59f2e2345e12b9ba43a694bf74e
+      body: |
+        runc.v1 was deprecated with the 20.10 major release of moby
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Robert Günzler <robertg@balena.io>
+        signed-off-by: Robert Günzler <robertg@balena.io>
+      author: Robert Günzler
+      nested: []
+  version: 20.10.40
+  title: ""
+  date: 2023-09-11T19:02:17.939Z
 - commits:
     - subject: Don't enable AppArmor if `apparmor_parser` is not present
       hash: ed8ba18e8776a7bf37b3326baeca8196b4ea76b0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54c6752ae9..a718e84b69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v20.10.40
+## (2023-09-11)
+
+* Re-vendor to get the containerd-shim-runc-v2 sources [Leandro Motta Barros]
+* Default to io.containerd.runc.v2 [Robert Günzler]
+
 # v20.10.39
 ## (2023-08-30)
 
diff --git a/VERSION b/VERSION
index 2f31da7d47..6741aba208 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20.10.39
\ No newline at end of file
+20.10.40
\ No newline at end of file