From d3232244a9d859ebea2009e0ac04506950877d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
Date: Fri, 16 Oct 2020 14:38:54 +0200
Subject: [PATCH] Assemble changes for release 20.11.3

---
 .changelog/3241.internal.md |  1 -
 .changelog/3307.trivial.md  |  1 -
 .changelog/3329.trivial.md  |  4 ----
 .changelog/3330.bugfix.md   |  1 -
 .changelog/3416.internal.md |  1 -
 CHANGELOG.md                | 21 +++++++++++++++++++++
 6 files changed, 21 insertions(+), 8 deletions(-)
 delete mode 100644 .changelog/3241.internal.md
 delete mode 100644 .changelog/3307.trivial.md
 delete mode 100644 .changelog/3329.trivial.md
 delete mode 100644 .changelog/3330.bugfix.md
 delete mode 100644 .changelog/3416.internal.md

diff --git a/.changelog/3241.internal.md b/.changelog/3241.internal.md
deleted file mode 100644
index b986ec66ecb..00000000000
--- a/.changelog/3241.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-go/storage/mkvs: Add node tracking to chunk restore
diff --git a/.changelog/3307.trivial.md b/.changelog/3307.trivial.md
deleted file mode 100644
index 0b38bfbdb55..00000000000
--- a/.changelog/3307.trivial.md
+++ /dev/null
@@ -1 +0,0 @@
-go: Add checkpointer control options to storage worker and consensus
diff --git a/.changelog/3329.trivial.md b/.changelog/3329.trivial.md
deleted file mode 100644
index ff55622697a..00000000000
--- a/.changelog/3329.trivial.md
+++ /dev/null
@@ -1,4 +0,0 @@
-go/worker/storage: Abort multipart insert after failed finalize
-
-Make sure to abort the multipart insert after a failed finalize operation as
-otherwise all normal batch operations will continue to fail.
diff --git a/.changelog/3330.bugfix.md b/.changelog/3330.bugfix.md
deleted file mode 100644
index c73b9808199..00000000000
--- a/.changelog/3330.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-go/storage/mkvs: Fix Finalize after checkpoint restore
diff --git a/.changelog/3416.internal.md b/.changelog/3416.internal.md
deleted file mode 100644
index b2ad6a08e5a..00000000000
--- a/.changelog/3416.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-go: Add ability to set initial block height at genesis
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e77dc80ce67..ab2bef94ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,27 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 20.11.3 (2020-10-16)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 1.0.0     |
+| Runtime Host      | 1.0.0     |
+| Runtime Committee | 1.0.0     |
+
+### Bug Fixes
+
+- go/storage/mkvs: Fix Finalize after checkpoint restore
+  ([#3330](https://github.com/oasisprotocol/oasis-core/issues/3330))
+
+### Internal Changes
+
+- go/storage/mkvs: Add node tracking to chunk restore
+  ([#3241](https://github.com/oasisprotocol/oasis-core/issues/3241))
+
+- go: Add ability to set initial block height at genesis
+  ([#3416](https://github.com/oasisprotocol/oasis-core/issues/3416))
+
 ## 20.11.2 (2020-10-13)
 
 | Protocol          | Version   |