From 37fe4b9afac63b8269184168bd01787cad866844 Mon Sep 17 00:00:00 2001
From: jingyih <jingyih@google.com>
Date: Tue, 15 Sep 2020 09:20:08 -0700
Subject: [PATCH] CHANGELOG: update from 12288 and 12299

---
 CHANGELOG-3.4.md | 17 +++++++++++++++--
 CHANGELOG-3.5.md |  2 ++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index 611a61bcb..bb182cc11 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -9,9 +9,22 @@ The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.
 <hr>
 
 
-## v3.4.13 (2020 TBD)
+## v3.4.14 (2020 TBD)
 
-See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.11...v3.4.13) and [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md) for any breaking changes.
+See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.13...v3.4.14) and [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md) for any breaking changes.
+
+### etcd server
+
+- [Fix server panic](https://github.com/etcd-io/etcd/pull/12288) when force-new-cluster flag is enabled in a cluster which had learner node.
+
+
+
+<hr>
+
+
+## [v3.4.13](https://github.com/etcd-io/etcd/releases/tag/v3.4.13) (2020-8-24)
+
+See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.12...v3.4.13) and [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md) for any breaking changes.
 
 ### Security
 
diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index 1f3702356..54c93c4e3 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -138,6 +138,8 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 - Add [`etcd --experimental-watch-progress-notify-interval`](https://github.com/etcd-io/etcd/pull/12216) flag to make watch progress notify interval configurable.
 - Fix [server panic in slow writes warnings](https://github.com/etcd-io/etcd/issues/12197).
   - Fixed via [PR#12238](https://github.com/etcd-io/etcd/pull/12238).
+- [Fix server panic](https://github.com/etcd-io/etcd/pull/12288) when force-new-cluster flag is enabled in a cluster which had learner node.
+
 
 ### Package `runtime`