From 10cdabe721d24e9b5045ae0d58057670373d76db Mon Sep 17 00:00:00 2001
From: CFC4N <cfc4nphp@gmail.com>
Date: Sun, 21 Jun 2020 00:00:41 +0800
Subject: [PATCH] CHANGELOG: update for
 https://github.com/etcd-io/etcd/pull/11980 ,
 https://github.com/etcd-io/etcd/pull/11986 ,
 https://github.com/etcd-io/etcd/pull/11987 .

---
 CHANGELOG-3.5.md                        | 3 +++
 Documentation/op-guide/configuration.md | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index d4fd7d83c..e5e9e9f98 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -126,6 +126,9 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 - Improve logging around snapshot send and receive.
 - [Push down RangeOptions.limit argv into index tree to reduce memory overhead](https://github.com/etcd-io/etcd/pull/11990).
 - Add [reason field for /health response](https://github.com/etcd-io/etcd/pull/11983).
+- 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).
 
 ### Package `embed`
 
diff --git a/Documentation/op-guide/configuration.md b/Documentation/op-guide/configuration.md
index 20911e928..01ef434b7 100644
--- a/Documentation/op-guide/configuration.md
+++ b/Documentation/op-guide/configuration.md
@@ -439,6 +439,11 @@ Follow the instructions when using these flags.
 + default: 10
 + env variable: (not supported)
 
+### --auth-token-ttl
++ Time (in seconds) of the auth-token-ttl. Support `--auth-token=simple` model only.
++ default: 300
++ env variable: (not supported)
+
 ## Experimental flags
 
 ### --experimental-corrupt-check-time