From ac956f3e1459571c20e2aa665bc7f43e9474f24f Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Mon, 6 Jun 2022 14:04:03 +0200
Subject: [PATCH] changelog: Assemble changes for 21.3.14 release

---
 .changelog/4687.bugfix.md   | 13 -------------
 .changelog/4754.internal.md |  1 -
 .changelog/4762.trivial.md  |  0
 .changelog/4776.bugfix.md   |  1 -
 .punch_version.py           |  2 +-
 CHANGELOG.md                | 33 +++++++++++++++++++++++++++++++++
 6 files changed, 34 insertions(+), 16 deletions(-)
 delete mode 100644 .changelog/4687.bugfix.md
 delete mode 100644 .changelog/4754.internal.md
 delete mode 100644 .changelog/4762.trivial.md
 delete mode 100644 .changelog/4776.bugfix.md

diff --git a/.changelog/4687.bugfix.md b/.changelog/4687.bugfix.md
deleted file mode 100644
index 101874fd8e5..00000000000
--- a/.changelog/4687.bugfix.md
+++ /dev/null
@@ -1,13 +0,0 @@
-go/runtime/host/sandbox: Properly handle clone3 in seccomp policy
-
-We need to handle the clone3 syscall in a special manner as there are
-several complications to its handling:
-
-- Newer glibc versions will try clone3 first and if they see EPERM they
-  will instantly fail making the program unable to spawn threads.
-
-- The clone3 syscall is much more complex than clone and so we can't
-  simply inspect its flags as we do for clone.
-
-Therefore we need to reject the syscall with ENOSYS, causing fallback to
-clone.
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/4762.trivial.md b/.changelog/4762.trivial.md
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.changelog/4776.bugfix.md b/.changelog/4776.bugfix.md
deleted file mode 100644
index b160248c5f4..00000000000
--- a/.changelog/4776.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Disable storage sync for archive nodes
diff --git a/.punch_version.py b/.punch_version.py
index a448b78d31a..89e82db4a91 100644
--- a/.punch_version.py
+++ b/.punch_version.py
@@ -1,3 +1,3 @@
 year = '21'
 minor = 3
-micro = 13
+micro = 14
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb017a7a765..035426bc202 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,39 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 21.3.14 (2022-06-06)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 4.0.0     |
+| Runtime Host      | 4.0.0     |
+| Runtime Committee | 3.0.0     |
+
+### Bug Fixes
+
+- go/runtime/host/sandbox: Properly handle clone3 in seccomp policy
+  ([#4687](https://github.com/oasisprotocol/oasis-core/issues/4687))
+
+  We need to handle the clone3 syscall in a special manner as there are
+  several complications to its handling:
+
+  - Newer glibc versions will try clone3 first and if they see EPERM they
+    will instantly fail making the program unable to spawn threads.
+
+  - The clone3 syscall is much more complex than clone and so we can't
+    simply inspect its flags as we do for clone.
+
+  Therefore we need to reject the syscall with ENOSYS, causing fallback to
+  clone.
+
+- Disable storage sync for archive nodes
+  ([#4776](https://github.com/oasisprotocol/oasis-core/issues/4776))
+
+### Internal Changes
+
+- docker/oasis-core-dev: Fix golangci-lint install
+  ([#4754](https://github.com/oasisprotocol/oasis-core/issues/4754))
+
 ## 21.3.13 (2022-04-19)
 
 | Protocol          | Version   |