From e9d9dfe2f44f9fa4f14cf1719aa9abfa244e0e55 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Sep 07 2020 07:39:56 +0000
Subject: [PATCH 1/2] bump version to 1.22.1


---

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 981d432..96ffa15 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -56,7 +56,7 @@ copyright = u'2017, Mike McLean, Mike B, Dennis Gilmore, Mathieu Bridon, Ian McL
 # The short X.Y version.
 version = '1.22'
 # The full version, including alpha/beta/rc tags.
-release = '1.22.0'
+release = '1.22.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/koji.spec b/koji.spec
index 6d3b2ae..232c045 100644
--- a/koji.spec
+++ b/koji.spec
@@ -81,7 +81,7 @@
 %define release %{baserelease}
 %endif
 Name: koji
-Version: 1.22.0
+Version: 1.22.1
 Release: %{release}%{?dist}
 License: LGPLv2 and GPLv2+
 # the included arch lib from yum's rpmUtils is GPLv2+
diff --git a/setup.py b/setup.py
index b7bb760..5e7ff6b 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def get_install_requires():
 
 setup(
     name="koji",
-    version="1.22.0",
+    version="1.22.1",
     description=("Koji is a system for building and tracking RPMS. The base"
                  " package contains shared libraries and the command-line"
                  " interface."),

From d67462c30784d1a80578dc2fc888159512ae4581 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Sep 07 2020 07:41:29 +0000
Subject: [PATCH 2/2] 1.22.1 release notes


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

---

diff --git a/docs/source/release_notes/release_notes.rst b/docs/source/release_notes/release_notes.rst
index c42d9ab..222a2ae 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.22.1
     release_notes_1.22
     release_notes_1.21.1
     release_notes_1.21
diff --git a/docs/source/release_notes/release_notes_1.22.1.rst b/docs/source/release_notes/release_notes_1.22.1.rst
new file mode 100644
index 0000000..8cf5762
--- /dev/null
+++ b/docs/source/release_notes/release_notes_1.22.1.rst
@@ -0,0 +1,80 @@
+Koji 1.22.1 Release notes
+=========================
+
+All changes can be found at `pagure <https://pagure.io/koji/roadmap/1.22.1/>`_.
+Most important changes are listed here.
+
+Migrating from Koji 1.22
+------------------------
+
+No special actions are needed.
+
+Security Fixes
+--------------
+None
+
+Library changes
+---------------
+**Fix time formatting for timezone values**
+
+| PR: https://pagure.io/koji/pull-request/2409
+
+Some datetime values returned from hub were not properly parsed which resulted
+in failing CLI/web. We've replaced it with GMT timestamps internally, so we are
+more sure about their proper timezones.
+
+Hub Changes
+-----------
+**ensure that cursors are closed in QueryProcessor.iterate()**
+
+| PR: https://pagure.io/koji/pull-request/2436
+
+In some cases (especially ``hastag`` policy in combination with ``clone-tag``)
+there were allocated db cursors but not freed.
+
+**stricter config file permissions
+
+| PR: https://pagure.io/koji/pull-request/2474
+
+Hub and web config files contains sensitive values. We've made permissions
+stricter by default and encourage existing users to review theirs.
+
+Builder Changes
+---------------
+**builder: handle btrfs subvolumes in ApplianceTask**
+
+| PR: https://pagure.io/koji/pull-request/2365
+
+When using btrfs, the / mountpoint can be associated with a subvolume; if that's
+the case, return the btrfs partition as the root device. Note that this
+implementation assumes there's only one btrfs partition defined in kickstart.
+
+**fix extra-boot-args option**
+
+| PR: https://pagure.io/koji/pull-request/2452
+
+``bootloader append`` directive in kickstart wasn't properly passed to lorax.
+
+API Changes
+-----------
+**editTag: make compat perm_id option an alias for perm**
+
+| PR: https://pagure.io/koji/pull-request/2409
+
+It is a backward compatible change.
+
+
+Documentation Changes
+---------------------
+**setting rpm macros for build tags**
+
+| PR: https://pagure.io/koji/pull-request/2410
+
+
+**more info about permission system**
+
+| PR: https://pagure.io/koji/pull-request/2415
+
+**migration note regarding dropped krb configuration options**
+
+| PR: https://pagure.io/koji/pull-request/2427