From 73b9a391d10414bc1e08b16f9906ea25a06dd711 Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Tue, 5 Sep 2023 11:49:53 +0000
Subject: [PATCH 1/2] Add changelog for 2.21.2

[noissue]

(cherry picked from commit 1dedd5676d27223832195afd4ed44a6a66e590d3)
---
 CHANGES.rst        | 20 ++++++++++++++++++++
 CHANGES/869.bugfix |  1 -
 CHANGES/879.misc   |  1 -
 3 files changed, 20 insertions(+), 2 deletions(-)
 delete mode 100644 CHANGES/869.bugfix
 delete mode 100644 CHANGES/879.misc

diff --git a/CHANGES.rst b/CHANGES.rst
index 7690b8b23..49ce18236 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,6 +13,26 @@ Changelog
 
 .. towncrier release notes start
 
+2.21.2 (2023-09-05)
+===================
+
+Bugfixes
+--------
+
+- Fixed advanced copy due to pulpcore deprecations.
+  `#869 <https://github.com/pulp/pulp_deb/issues/869>`_
+
+
+Misc
+----
+
+- Fixed the deb/copy/ API path for scenarios that modify the API root.
+  `#879 <https://github.com/pulp/pulp_deb/issues/879>`_
+
+
+----
+
+
 2.21.1 (2023-07-20)
 ===================
 
diff --git a/CHANGES/869.bugfix b/CHANGES/869.bugfix
deleted file mode 100644
index cc25302c5..000000000
--- a/CHANGES/869.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed advanced copy due to pulpcore deprecations.
diff --git a/CHANGES/879.misc b/CHANGES/879.misc
deleted file mode 100644
index 7f585ad43..000000000
--- a/CHANGES/879.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fixed the deb/copy/ API path for scenarios that modify the API root.

From 8a8541b387573b65d9444b4df387ab33880ebdb9 Mon Sep 17 00:00:00 2001
From: Quirin Pamp <pamp@atix.de>
Date: Tue, 5 Sep 2023 14:05:16 +0200
Subject: [PATCH 2/2] Add changelog for 2.20.4

[noissue]

(cherry picked from commit 141e0a78d56704f55cded2e337fe140bf630b67a)
---
 CHANGES.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 49ce18236..7b26e6fe2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -119,6 +119,26 @@ Misc
 ----
 
 
+2.20.4 (2023-09-05)
+===================
+
+Bugfixes
+--------
+
+- Improve the pulp_deb "No valid Release file found" error message for gpg validation fail.
+  `#399 <https://github.com/pulp/pulp_deb/issues/399>`_
+
+
+Misc
+----
+
+- Fixed the deb/copy/ API path for scenarios that modify the API root.
+  `#879 <https://github.com/pulp/pulp_deb/issues/879>`_
+
+
+----
+
+
 2.20.3 (2023-07-20)
 ===================