From 0475be51662dfcae008aeda5ad9f7d6986c30efa Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 1 May 2023 09:54:42 +0200
Subject: [PATCH] Release 3.4.4.

---
 CHANGELOG.rst                                | 18 ++++++++++++++++++
 changelogs/changelog.yaml                    | 19 +++++++++++++++++++
 changelogs/fragments/3.4.4.yml               |  1 -
 changelogs/fragments/612-requests-2.29.0.yml |  4 ----
 4 files changed, 37 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/3.4.4.yml
 delete mode 100644 changelogs/fragments/612-requests-2.29.0.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d726cb2b..537bc625 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,24 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v3.4.4
+======
+
+Release Summary
+---------------
+
+Maintenance release with updated EE requirements and updated documentation.
+
+Minor Changes
+-------------
+
+- Restrict requests to versions before 2.29.0, and urllib3 to versions before 2.0.0. This is necessary until the vendored code from Docker SDK for Python has been fully adjusted to work with a feature of urllib3 that is used since requests 2.29.0 (https://github.com/ansible-collections/community.docker/issues/611, https://github.com/ansible-collections/community.docker/pull/612).
+
+Known Issues
+------------
+
+- The modules and plugins using the vendored code from Docker SDK for Python currently do not work with requests 2.29.0 and/or urllib3 2.0.0. The same is currently true for the latest version of Docker SDK for Python itself (https://github.com/ansible-collections/community.docker/issues/611, https://github.com/ansible-collections/community.docker/pull/612).
+
 v3.4.3
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index c956ade9..f745a911 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1145,3 +1145,22 @@ releases:
     fragments:
     - 3.4.3.yml
     release_date: '2023-03-24'
+  3.4.4:
+    changes:
+      known_issues:
+      - The modules and plugins using the vendored code from Docker SDK for Python
+        currently do not work with requests 2.29.0 and/or urllib3 2.0.0. The same
+        is currently true for the latest version of Docker SDK for Python itself (https://github.com/ansible-collections/community.docker/issues/611,
+        https://github.com/ansible-collections/community.docker/pull/612).
+      minor_changes:
+      - Restrict requests to versions before 2.29.0, and urllib3 to versions before
+        2.0.0. This is necessary until the vendored code from Docker SDK for Python
+        has been fully adjusted to work with a feature of urllib3 that is used since
+        requests 2.29.0 (https://github.com/ansible-collections/community.docker/issues/611,
+        https://github.com/ansible-collections/community.docker/pull/612).
+      release_summary: Maintenance release with updated EE requirements and updated
+        documentation.
+    fragments:
+    - 3.4.4.yml
+    - 612-requests-2.29.0.yml
+    release_date: '2023-05-01'
diff --git a/changelogs/fragments/3.4.4.yml b/changelogs/fragments/3.4.4.yml
deleted file mode 100644
index 5e555dea..00000000
--- a/changelogs/fragments/3.4.4.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Maintenance release with updated EE requirements and updated documentation.
diff --git a/changelogs/fragments/612-requests-2.29.0.yml b/changelogs/fragments/612-requests-2.29.0.yml
deleted file mode 100644
index 51322de0..00000000
--- a/changelogs/fragments/612-requests-2.29.0.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-known_issues:
-  - "The modules and plugins using the vendored code from Docker SDK for Python currently do not work with requests 2.29.0 and/or urllib3 2.0.0. The same is currently true for the latest version of Docker SDK for Python itself (https://github.com/ansible-collections/community.docker/issues/611, https://github.com/ansible-collections/community.docker/pull/612)."
-minor_changes:
-  - "Restrict requests to versions before 2.29.0, and urllib3 to versions before 2.0.0. This is necessary until the vendored code from Docker SDK for Python has been fully adjusted to work with a feature of urllib3 that is used since requests 2.29.0 (https://github.com/ansible-collections/community.docker/issues/611, https://github.com/ansible-collections/community.docker/pull/612)."