Merge pull request #12001 from cfc4n/master

CHANGELOG: update for PR #11980 , #11986 , # 11987 ,
etcd-io · Jun 22, 2020 · 6ec5d5f · 6ec5d5f
2 parents f105700 + a71fa24
commit 6ec5d5f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
@@ -128,6 +128,9 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 - Add [reason field for /health response](https://github.com/etcd-io/etcd/pull/11983).
 - 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).
 
 ### Package `embed`
 

diff --git 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