From 3ced62a6c7fbf89abe333f3364cb3ff1677af588 Mon Sep 17 00:00:00 2001
From: CFC4N <cfc4nphp@gmail.com>
Date: Thu, 25 Jun 2020 20:54:46 +0800
Subject: [PATCH] CHANGELOG-3.3-3.4: update for
 https://github.com/etcd-io/etcd/pull/12069 ,and other cherry pick PRs.

---
 CHANGELOG-3.3.md | 23 +++++++++++++++++++++++
 CHANGELOG-3.4.md |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index a8c450d33c5..e911fdea466 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -5,6 +5,29 @@ Previous change logs can be found at [CHANGELOG-3.2](https://github.com/etcd-io/
 
 The minimum recommended etcd versions to run in **production** are 3.2.28+, 3.3.18+, and 3.4.2+.
 
+<hr>
+
+
+## [v3.3.23](https://github.com/etcd-io/etcd/releases/tag/v3.3.23) (TBD)
+
+See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.22...v3.3.23) and [v3.3 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_3.md) for any breaking changes.
+
+### Breaking Changes
+- Fix [incorrect package dependency when etcd clientv3 used as libary](https://github.com/etcd-io/etcd/issues/12068).
+
+### Package `wal`
+
+### etcd server
+- Fix [watch stream got closed if one watch request is not permitted](https://github.com/etcd-io/etcd/pull/11758).
+- Add [etcd --auth-token-ttl](https://github.com/etcd-io/etcd/pull/11980) flag to customize `simpleTokenTTL` settings.
+- Improve [runtime.FDUsage objects malloc of Memory Usage and CPU Usage](https://github.com/etcd-io/etcd/pull/11986).
+- Improve [mvcc.watchResponse channel Memory Usage](https://github.com/etcd-io/etcd/pull/11987).
+
+### Go
+
+- Compile with [*Go 1.12.17*](https://golang.org/doc/devel/release.html#go1.12).
+
+
 
 <hr>
 
diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index bbd17ddd27a..b89a962c26e 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -17,6 +17,9 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.4.9...v3.4.10) and
 
 - Add [`--unsafe-no-fsync`](https://github.com/etcd-io/etcd/pull/11946) flag.
   - Setting the flag disables all uses of fsync, which is unsafe and will cause data loss. This flag makes it possible to run an etcd node for testing and development without placing lots of load on the file system.
+- Add [etcd --auth-token-ttl](https://github.com/etcd-io/etcd/pull/11980) flag to customize `simpleTokenTTL` settings.
+- Improve [runtime.FDUsage objects malloc of Memory Usage and CPU Usage](https://github.com/etcd-io/etcd/pull/11986).
+- Improve [mvcc.watchResponse channel Memory Usage](https://github.com/etcd-io/etcd/pull/11987).
 
 ### Go