From 416b8c281f0a23357f21ab07dc9a1084f8699d0c Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Thu, 27 Jul 2023 14:04:06 +0200
Subject: [PATCH] changelog: Assemble changes for 22.2.10 release

---
 .changelog/5308.internal.md |  4 ----
 .changelog/5313.trivial.md  |  0
 .changelog/5321.bugfix.md   |  1 -
 .punch_version.py           |  2 +-
 CHANGELOG.md                | 21 +++++++++++++++++++++
 5 files changed, 22 insertions(+), 6 deletions(-)
 delete mode 100644 .changelog/5308.internal.md
 delete mode 100644 .changelog/5313.trivial.md
 delete mode 100644 .changelog/5321.bugfix.md

diff --git a/.changelog/5308.internal.md b/.changelog/5308.internal.md
deleted file mode 100644
index af357ebd9b3..00000000000
--- a/.changelog/5308.internal.md
+++ /dev/null
@@ -1,4 +0,0 @@
-go/oasis-test-runner: Build key manager runtime with trust root
-
-The runtime trust-root scenarios now build not only the simple key/value
-but also the key manager runtime with an embedded trust root.
diff --git a/.changelog/5313.trivial.md b/.changelog/5313.trivial.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.changelog/5321.bugfix.md b/.changelog/5321.bugfix.md
deleted file mode 100644
index 774e52df69d..00000000000
--- a/.changelog/5321.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-go/storage/mkvs: Fix commit of nil entries
diff --git a/.punch_version.py b/.punch_version.py
index f03aa678c6a..9528ef5bb78 100644
--- a/.punch_version.py
+++ b/.punch_version.py
@@ -1,3 +1,3 @@
 year = '22'
 minor = 2
-micro = 9
+micro = 10
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c30f4de3c17..cab14f52bd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,27 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 22.2.10 (2023-07-27)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 6.0.0     |
+| Runtime Host      | 5.1.0     |
+| Runtime Committee | 4.0.0     |
+
+### Bug Fixes
+
+- go/storage/mkvs: Fix commit of nil entries
+  ([#5321](https://github.com/oasisprotocol/oasis-core/issues/5321))
+
+### Internal Changes
+
+- go/oasis-test-runner: Build key manager runtime with trust root
+  ([#5308](https://github.com/oasisprotocol/oasis-core/issues/5308))
+
+  The runtime trust-root scenarios now build not only the simple key/value
+  but also the key manager runtime with an embedded trust root.
+
 ## 22.2.9 (2023-06-29)
 
 | Protocol          | Version   |