From be225d7e3f5696b91ca492da92077d550bce36eb Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Mar 29 2021 11:30:24 +0000
Subject: [PATCH 1/2] 1.24.1 release notes


Fixes: https://pagure.io/koji/issue/2778

---

diff --git a/docs/source/release_notes/release_notes.rst b/docs/source/release_notes/release_notes.rst
index e2712b8..8b502fd 100644
--- a/docs/source/release_notes/release_notes.rst
+++ b/docs/source/release_notes/release_notes.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release_notes_1.24.1
     release_notes_1.24
     release_notes_1.23.1
     release_notes_1.23
diff --git a/docs/source/release_notes/release_notes_1.24.1.rst b/docs/source/release_notes/release_notes_1.24.1.rst
new file mode 100644
index 0000000..0c4e441
--- /dev/null
+++ b/docs/source/release_notes/release_notes_1.24.1.rst
@@ -0,0 +1,116 @@
+Koji 1.24.1 Release notes
+=========================
+
+All changes can be found at `pagure <https://pagure.io/koji/roadmap/1.24.1/>`_.
+Most important changes are listed here.
+
+Migrating from Koji 1.24
+------------------------
+
+No special actions are needed.
+
+Security Fixes
+--------------
+
+None
+
+System Changes
+--------------
+**drop PyOpenSSL usage**
+
+Library is no more needed (superseded by ``requests``).
+
+| PR: https://pagure.io/koji/pull-request/2753
+
+Library changes
+---------------
+
+**revert "requests exception"**
+
+Regression fix for retrying requests to hub.
+
+| PR: https://pagure.io/koji/pull-request/2787
+
+CLI changes
+-----------
+**adding check for the license header key**
+
+CLI can sometimes fail on missing header key. Not happening anymore.
+
+| PR: https://pagure.io/koji/pull-request/2692
+
+Hub Changes
+-----------
+**set correct import_type for volume policy in completeImageBuild**
+
+Policy data provided incorrect ``import_type`` (maven instead of image)
+
+| PR: https://pagure.io/koji/pull-request/2713
+
+Web Changes
+-----------
+**escape vcs and disturl**
+
+Web page correctly escapes these URLs now.
+
+| PR: https://pagure.io/koji/pull-request/2747
+
+**optional KojiHubCA usage**
+
+1.24 created a regression that ``KojiHubCA`` option is required even in case
+when no SSL auth is used for web. Fixed.
+
+| PR: https://pagure.io/koji/pull-request/2749
+
+Utilities Changes
+-----------------
+**repo removal improvements**
+
+Few bugs related to kojira's repo removal could have caused stalling delete
+thread or even not deleting old repos at all.
+
+| PR: https://pagure.io/koji/pull-request/2755
+| PR: https://pagure.io/koji/pull-request/2715
+| PR: https://pagure.io/koji/pull-request/2699
+
+Documentation/DevTools Changes
+------------------------------
+**remove "ca" option from server howto**
+
+| PR: https://pagure.io/koji/pull-request/2725
+
+**update kojid steps in server howto**
+
+| PR: https://pagure.io/koji/pull-request/2724
+
+**fix Fedora's koji URL**
+
+| PR: https://pagure.io/koji/pull-request/2777
+
+**jenkins fedora -> centos migration**
+
+| PR: https://pagure.io/koji/pull-request/2754
+
+**document getNextRelease method**
+
+| PR: https://pagure.io/koji/pull-request/2706
+
+**Additional docs for CVE-2020-15856**
+
+| PR: https://pagure.io/koji/pull-request/2717
+
+**Fix small documentation typo**
+
+| PR: https://pagure.io/koji/pull-request/2772
+
+**set WSGIProcessGroup inside Directory**
+
+| PR: https://pagure.io/koji/pull-request/2731
+
+**tests: stop mock in DBQueryTest**
+
+| PR: https://pagure.io/koji/pull-request/2759
+
+**devtools: updated Dockerfiles**
+
+| PR: https://pagure.io/koji/pull-request/2744
diff --git a/koji.spec b/koji.spec
index 05dc902..01d133d 100644
--- a/koji.spec
+++ b/koji.spec
@@ -78,7 +78,7 @@
 %define release %{baserelease}
 %endif
 Name: koji
-Version: 1.24.0
+Version: 1.24.1
 Release: %{release}%{?dist}
 License: LGPLv2 and GPLv2+
 # the included arch lib from yum's rpmUtils is GPLv2+
diff --git a/koji/_version.py b/koji/_version.py
index d4ca214..1ebfcbe 100644
--- a/koji/_version.py
+++ b/koji/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (1, 24, 0)
+__version_info__ = (1, 24, 1)
 __version__ = '.'.join([str(x) for x in __version_info__])

From 5a59490e415913260c6fc008b86904e5ac880e8e Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 01 2021 08:43:40 +0000
Subject: [PATCH 2/2] grammar tweaks


---

diff --git a/docs/source/release_notes/release_notes_1.24.1.rst b/docs/source/release_notes/release_notes_1.24.1.rst
index 0c4e441..3534c1e 100644
--- a/docs/source/release_notes/release_notes_1.24.1.rst
+++ b/docs/source/release_notes/release_notes_1.24.1.rst
@@ -18,7 +18,7 @@ System Changes
 --------------
 **drop PyOpenSSL usage**
 
-Library is no more needed (superseded by ``requests``).
+Library is no longer needed (superseded by ``requests``).
 
 | PR: https://pagure.io/koji/pull-request/2753
 
@@ -35,7 +35,7 @@ CLI changes
 -----------
 **adding check for the license header key**
 
-CLI can sometimes fail on missing header key. Not happening anymore.
+The CLI could sometimes fail on a missing header key. This no longer happens.
 
 | PR: https://pagure.io/koji/pull-request/2692
 
@@ -57,8 +57,8 @@ Web page correctly escapes these URLs now.
 
 **optional KojiHubCA usage**
 
-1.24 created a regression that ``KojiHubCA`` option is required even in case
-when no SSL auth is used for web. Fixed.
+Koji 1.24 introduced a bug where the ``KojiHubCA`` option was required even in
+cases when SSL auth was not used for web. Fixed.
 
 | PR: https://pagure.io/koji/pull-request/2749
 
@@ -66,8 +66,9 @@ Utilities Changes
 -----------------
 **repo removal improvements**
 
-Few bugs related to kojira's repo removal could have caused stalling delete
-thread or even not deleting old repos at all.
+A few bugs related to kojira's repo removal have been fixed. In some cases,
+these bugs could have stalled delete threads or even blocked repo deletions
+altogether.
 
 | PR: https://pagure.io/koji/pull-request/2755
 | PR: https://pagure.io/koji/pull-request/2715

