From 854c32717990eda4de757200d08d42128c135773 Mon Sep 17 00:00:00 2001
From: tangcong <tangcong506@gmail.com>
Date: Sat, 20 Jun 2020 11:29:56 +0800
Subject: [PATCH] CHANGELOG: update for 12030

---
 CHANGELOG-3.5.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index d4fd7d83c..8b816d3b4 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -177,6 +177,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
 
 - Fix [`panic on error`](https://github.com/etcd-io/etcd/pull/11694) for metrics handler.
 - Add [gRPC keepalive related flags](https://github.com/etcd-io/etcd/pull/11711) `grpc-keepalive-min-time`, `grpc-keepalive-interval` and `grpc-keepalive-timeout`.
+- [Fix grpc watch proxy hangs when failed to cancel a watcher](https://github.com/etcd-io/etcd/pull/12030) .
 
 ### Auth