Merge pull request #11645 from jingyih/update_changelog_11640

CHANGELOG: update from #11640 and #11644
etcd-io · Feb 23, 2020 · 085b19b · 085b19b
2 parents 8c1a820 + d911a2b
commit 085b19b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
@@ -515,6 +515,7 @@ See [security doc](https://github.com/etcd-io/etcd/blob/master/Documentation/op-
 - Fix [server crash from creating an empty role](https://github.com/etcd-io/etcd/pull/10907).
   - Previously, creating a role with an empty name crashed etcd server with an error code `Unavailable`.
   - Now, creating a role with an empty name is not allowed with an error code `InvalidArgument`.
+- Fix [quorum protection logic when promoting a learner](https://github.com/etcd-io/etcd/pull/11640).
 
 ### API
 

diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
@@ -89,6 +89,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 - Support [rollback/downgrade](TODO).
 - Deprecate v2 apply on cluster version. [Use v3 request to set cluster version and recover cluster version from v3 backend](https://github.com/etcd-io/etcd/pull/11427).
 - [Fix corruption bug in defrag](https://github.com/etcd-io/etcd/pull/11613).
+- Fix [quorum protection logic when promoting a learner](https://github.com/etcd-io/etcd/pull/11640).
 
 ### Package `embed`