From 1022b8b49360f9129a9820093c2eb7c7eb939d0e Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Wed, 25 May 2022 12:27:08 +0200
Subject: [PATCH] changelog: Assemble changes for 22.1.7 release

---
 .changelog/4709.feature.md  |  7 -------
 .changelog/4754.internal.md |  1 -
 .changelog/4757.feature.md  |  4 ----
 .changelog/4762.trivial.md  |  0
 .punch_version.py           |  2 +-
 CHANGELOG.md                | 30 ++++++++++++++++++++++++++++++
 6 files changed, 31 insertions(+), 13 deletions(-)
 delete mode 100644 .changelog/4709.feature.md
 delete mode 100644 .changelog/4754.internal.md
 delete mode 100644 .changelog/4757.feature.md
 delete mode 100644 .changelog/4762.trivial.md

diff --git a/.changelog/4709.feature.md b/.changelog/4709.feature.md
deleted file mode 100644
index dfa7d47320e..00000000000
--- a/.changelog/4709.feature.md
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: Emit runtime logs as oasis-node logs
-
-Previously, runtime logs used a slightly different format.
-Also, they were written to stdout in a manner that was not
-synchronized with node logs, so the two sets of logs
-sometimes intertwined mid-line. Those annoyances are gone,
-plus runtime logs are now annotated with the runtime ID.
diff --git a/.changelog/4754.internal.md b/.changelog/4754.internal.md
deleted file mode 100644
index 2a59fa81fb7..00000000000
--- a/.changelog/4754.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-docker/oasis-core-dev: Fix golangci-lint install
diff --git a/.changelog/4757.feature.md b/.changelog/4757.feature.md
deleted file mode 100644
index 98da091da8a..00000000000
--- a/.changelog/4757.feature.md
+++ /dev/null
@@ -1,4 +0,0 @@
-runtime: Add support for reporting EnclaveRPC peer feedback
-
-This makes EnclaveRPC more robust as the higher-level layer in the
-runtime can trigger peer replacement on high level errors.
diff --git a/.changelog/4762.trivial.md b/.changelog/4762.trivial.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.punch_version.py b/.punch_version.py
index 96ff50e051a..d64b8d6d16a 100644
--- a/.punch_version.py
+++ b/.punch_version.py
@@ -1,3 +1,3 @@
 year = '22'
 minor = 1
-micro = 6
+micro = 7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81903a0acb2..fb2fe066eb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,36 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 22.1.7 (2022-05-25)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 6.0.0     |
+| Runtime Host      | 5.0.0     |
+| Runtime Committee | 4.0.0     |
+
+### Features
+
+- runtime: Emit runtime logs as oasis-node logs
+  ([#4709](https://github.com/oasisprotocol/oasis-core/issues/4709))
+
+  Previously, runtime logs used a slightly different format.
+  Also, they were written to stdout in a manner that was not
+  synchronized with node logs, so the two sets of logs
+  sometimes intertwined mid-line. Those annoyances are gone,
+  plus runtime logs are now annotated with the runtime ID.
+
+- runtime: Add support for reporting EnclaveRPC peer feedback
+  ([#4757](https://github.com/oasisprotocol/oasis-core/issues/4757))
+
+  This makes EnclaveRPC more robust as the higher-level layer in the
+  runtime can trigger peer replacement on high level errors.
+
+### Internal Changes
+
+- docker/oasis-core-dev: Fix golangci-lint install
+  ([#4754](https://github.com/oasisprotocol/oasis-core/issues/4754))
+
 ## 22.1.6 (2022-05-06)
 
 | Protocol          | Version   |