From 2cff3de48d93a6ee2944c828a7abecf5ee181af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
Date: Tue, 27 Feb 2024 17:09:26 +0100
Subject: [PATCH] Assemble changes for 22.2.12 release

---
 .changelog/5347.doc.md      |  5 -----
 .changelog/5348.trivial.md  |  0
 .changelog/5403.bugfix.md   |  1 -
 .changelog/5421.internal.md |  1 -
 .changelog/5432.trivial.md  |  1 -
 .punch_version.py           |  2 +-
 CHANGELOG.md                | 28 ++++++++++++++++++++++++++++
 7 files changed, 29 insertions(+), 9 deletions(-)
 delete mode 100644 .changelog/5347.doc.md
 delete mode 100644 .changelog/5348.trivial.md
 delete mode 100644 .changelog/5403.bugfix.md
 delete mode 100644 .changelog/5421.internal.md
 delete mode 100644 .changelog/5432.trivial.md

diff --git a/.changelog/5347.doc.md b/.changelog/5347.doc.md
deleted file mode 100644
index b2511794e8c..00000000000
--- a/.changelog/5347.doc.md
+++ /dev/null
@@ -1,5 +0,0 @@
-docs: Pin tendermint links to 22.2.x branch
-
-Since we moved (and renamed folders) from tendermint to cometbft in the master
-branch, links in the stable branch docs to the source files are now broken.
-Fix the links by pointing to source files in the stable git branch.
diff --git a/.changelog/5348.trivial.md b/.changelog/5348.trivial.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.changelog/5403.bugfix.md b/.changelog/5403.bugfix.md
deleted file mode 100644
index cfe6cc5340a..00000000000
--- a/.changelog/5403.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-go/worker/client: Fix nil dereference on early Query
diff --git a/.changelog/5421.internal.md b/.changelog/5421.internal.md
deleted file mode 100644
index af5cf401a26..00000000000
--- a/.changelog/5421.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-Install setuptools to make Towncrier fork work with Python 3.12
diff --git a/.changelog/5432.trivial.md b/.changelog/5432.trivial.md
deleted file mode 100644
index eccb6465aea..00000000000
--- a/.changelog/5432.trivial.md
+++ /dev/null
@@ -1 +0,0 @@
-runtime/keymanager: Support new key manager status fields
diff --git a/.punch_version.py b/.punch_version.py
index f595be053be..ad4c1041a56 100644
--- a/.punch_version.py
+++ b/.punch_version.py
@@ -1,3 +1,3 @@
 year = '22'
 minor = 2
-micro = 11
+micro = 12
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37993bf75d5..4f03cfab184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,34 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 22.2.12 (2024-02-27)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 6.0.0     |
+| Runtime Host      | 5.1.0     |
+| Runtime Committee | 4.0.0     |
+
+### Bug Fixes
+
+- go/worker/client: Fix nil dereference on early Query
+  ([#5403](https://github.com/oasisprotocol/oasis-core/issues/5403))
+
+### Documentation Improvements
+
+- Pin Tendermint links to 22.2.x branch
+  ([#5347](https://github.com/oasisprotocol/oasis-core/issues/5347))
+
+  Since we moved (and renamed folders) from Tendermint to CometBFT in the
+  `master` branch, links in the stable branch docs to the source files are now
+  broken.
+  Fix the links by pointing to source files in the stable git branch.
+
+### Internal Changes
+
+- Install setuptools to make Towncrier fork work with Python 3.12
+  ([#5421](https://github.com/oasisprotocol/oasis-core/issues/5421))
+
 ## 22.2.11 (2023-08-09)
 
 | Protocol          | Version   |