From e2ff769244b95c94268697fdf59063989f0efe65 Mon Sep 17 00:00:00 2001
From: jingyih <jingyih@google.com>
Date: Sat, 29 Feb 2020 07:33:55 -0800
Subject: [PATCH] CHANGELOG: update from 11638

---
 CHANGELOG-3.3.md |  4 ++++
 CHANGELOG-3.4.md | 16 ++++++++++++++++
 CHANGELOG-3.5.md |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index d09e741ca2c..3d4703ccc96 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -13,6 +13,10 @@ The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.
 
 - [Fix corruption bug in defrag](https://github.com/etcd-io/etcd/pull/11613).
 
+### etcdctl v3
+
+- Fix [`etcdctl member add`](https://github.com/etcd-io/etcd/pull/11638) command to prevent potential timeout.
+
 <hr>
 
 ## v3.3.18 (2019-11-26)
diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index ecfa2000c89..89abb514e99 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -9,6 +9,19 @@ The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.
 <hr>
 
 
+## [v3.4.5](https://github.com/etcd-io/etcd/releases/tag/v3.4.5) (TBD)
+
+See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.4...v3.4.5) and [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md) for any breaking changes.
+
+**Again, before running upgrades from any previous release, please make sure to read change logs below and [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md).**
+
+### etcdctl v3
+
+- Fix [`etcdctl member add`](https://github.com/etcd-io/etcd/pull/11638) command to prevent potential timeout.
+
+
+<hr>
+
 ## [v3.4.4](https://github.com/etcd-io/etcd/releases/tag/v3.4.4) (2020-02-24)
 
 See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.3...v3.4.4) and [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md) for any breaking changes.
@@ -33,6 +46,8 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 - Fix [NoPassword check when adding user through GRPC gateway](https://github.com/etcd-io/etcd/pull/11418) ([issue#11414](https://github.com/etcd-io/etcd/issues/11414))
 - Fix bug where [some auth related messages are logged at wrong level](https://github.com/etcd-io/etcd/pull/11586)
 
+<hr>
+
 ## [v3.4.3](https://github.com/etcd-io/etcd/releases/tag/v3.4.3) (2019-10-24)
 
 See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.2...v3.4.3) and [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md) for any breaking changes.
@@ -51,6 +66,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 
 - Compile with [*Go 1.12.12*](https://golang.org/doc/devel/release.html#go1.12).
 
+<hr>
 
 ## [v3.4.2](https://github.com/etcd-io/etcd/releases/tag/v3.4.2) (2019-10-11)
 
diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index a5edf5b1184..3f5b95f5466 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -107,7 +107,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 - Use [ServerName as the authority](https://github.com/etcd-io/etcd/pull/11574) after bumping to grpc v1.26.0. Remove workaround in [#11184](https://github.com/etcd-io/etcd/pull/11184).
 ### etcdctl v3
 
-- Fix [`etcdctl member add`](https://github.com/etcd-io/etcd/pull/11194) command to prevent potential timeout.
+- Fix `etcdctl member add` command to prevent potential timeout. ([PR#11194](https://github.com/etcd-io/etcd/pull/11194) and [PR#11638](https://github.com/etcd-io/etcd/pull/11638))
 - Add [`etcdctl watch --progress-notify`](https://github.com/etcd-io/etcd/pull/11462) flag.
 - Add [`etcdctl auth status`](https://github.com/etcd-io/etcd/pull/11536) command to check if authentication is enabled