From 525b604b3e570b8218b690fbd59fb74bc15cf535 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Tue, 28 Jun 2022 14:30:42 +0200
Subject: [PATCH] changelog: Assemble changes for 22.1.8 release

---
 .changelog/4727.internal.md |  1 -
 .changelog/4733.trivial.md  |  0
 .changelog/4770.doc.md      |  1 -
 .changelog/4793.feature.md  |  4 ----
 .changelog/4808.bugfix.md   |  4 ----
 .changelog/4813.feature.md  |  1 -
 .changelog/4816.trivial.md  |  0
 .changelog/4821.feature.md  |  1 -
 .punch_version.py           |  2 +-
 CHANGELOG.md                | 40 +++++++++++++++++++++++++++++++++++++
 10 files changed, 41 insertions(+), 13 deletions(-)
 delete mode 100644 .changelog/4727.internal.md
 delete mode 100644 .changelog/4733.trivial.md
 delete mode 100644 .changelog/4770.doc.md
 delete mode 100644 .changelog/4793.feature.md
 delete mode 100644 .changelog/4808.bugfix.md
 delete mode 100644 .changelog/4813.feature.md
 delete mode 100644 .changelog/4816.trivial.md
 delete mode 100644 .changelog/4821.feature.md

diff --git a/.changelog/4727.internal.md b/.changelog/4727.internal.md
deleted file mode 100644
index 3435c71c012..00000000000
--- a/.changelog/4727.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-rust-toolchain: Migrate to TOML version of rust-toolchain
diff --git a/.changelog/4733.trivial.md b/.changelog/4733.trivial.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.changelog/4770.doc.md b/.changelog/4770.doc.md
deleted file mode 100644
index f4bbd1bd3f4..00000000000
--- a/.changelog/4770.doc.md
+++ /dev/null
@@ -1 +0,0 @@
-doc: Migrate ADRs to oasisprotocol/adrs repo
diff --git a/.changelog/4793.feature.md b/.changelog/4793.feature.md
deleted file mode 100644
index 31148201f75..00000000000
--- a/.changelog/4793.feature.md
+++ /dev/null
@@ -1,4 +0,0 @@
-go/consensus/tendermint: Add `consensus.tendermint.halt_height`
-
-This is equivalent to the cosmos `halt-height` option, to be used to
-bring a node down gracefully at a specific height.
diff --git a/.changelog/4808.bugfix.md b/.changelog/4808.bugfix.md
deleted file mode 100644
index e4f463e91e1..00000000000
--- a/.changelog/4808.bugfix.md
+++ /dev/null
@@ -1,4 +0,0 @@
-net-runner: Fix regression introduced in #4564
-
-Fix the missing Deployments field when oasis-net-runner generating the genesis
-state and no key manager is provided.
diff --git a/.changelog/4813.feature.md b/.changelog/4813.feature.md
deleted file mode 100644
index 980fe7055f6..00000000000
--- a/.changelog/4813.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-net-runner: Add --fixture.default.runtime.version flag
diff --git a/.changelog/4816.trivial.md b/.changelog/4816.trivial.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.changelog/4821.feature.md b/.changelog/4821.feature.md
deleted file mode 100644
index f17c4ffea56..00000000000
--- a/.changelog/4821.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-go/oasis-node: allow km to have private peers
diff --git a/.punch_version.py b/.punch_version.py
index d64b8d6d16a..235370eebed 100644
--- a/.punch_version.py
+++ b/.punch_version.py
@@ -1,3 +1,3 @@
 year = '22'
 minor = 1
-micro = 7
+micro = 8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f9f0a7d18f..260a020d2a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,46 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 22.1.8 (2022-06-28)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 6.0.0     |
+| Runtime Host      | 5.0.0     |
+| Runtime Committee | 4.0.0     |
+
+### Features
+
+- go/consensus/tendermint: Add `consensus.tendermint.halt_height`
+  ([#4793](https://github.com/oasisprotocol/oasis-core/issues/4793))
+
+  This is equivalent to the cosmos `halt-height` option, to be used to
+  bring a node down gracefully at a specific height.
+
+- net-runner: Add --fixture.default.runtime.version flag
+  ([#4813](https://github.com/oasisprotocol/oasis-core/issues/4813))
+
+- go/oasis-node: allow km to have private peers
+  ([#4821](https://github.com/oasisprotocol/oasis-core/issues/4821))
+
+### Bug Fixes
+
+- net-runner: Fix regression introduced in #4564
+  ([#4808](https://github.com/oasisprotocol/oasis-core/issues/4808))
+
+  Fix the missing Deployments field when oasis-net-runner generating the genesis
+  state and no key manager is provided.
+
+### Documentation Improvements
+
+- doc: Migrate ADRs to oasisprotocol/adrs repo
+  ([#4770](https://github.com/oasisprotocol/oasis-core/issues/4770))
+
+### Internal Changes
+
+- rust-toolchain: Migrate to TOML version of rust-toolchain
+  ([#4727](https://github.com/oasisprotocol/oasis-core/issues/4727))
+
 ## 22.1.7 (2022-05-25)
 
 | Protocol          | Version   |