From b3b75c8f564ff650ee7a60cebaa54d9dd62e7343 Mon Sep 17 00:00:00 2001
From: EDDYCJY <313687982@qq.com>
Date: Wed, 19 Feb 2020 16:00:07 +0800
Subject: [PATCH 1/2] CHANGELOG-3.5: update from 11564

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

diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index 576c07a1928..9f425bbe701 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -95,6 +95,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
   - Fix ["kube-apiserver: failover on multi-member etcd cluster fails certificate check on DNS mismatch" (kubernetes#83028)](https://github.com/kubernetes/kubernetes/issues/83028).
 - Fix [IPv6 endpoint parsing in client](https://github.com/etcd-io/etcd/pull/11211).
   - Fix ["1.16: etcd client does not parse IPv6 addresses correctly when members are joining" (kubernetes#83550)](https://github.com/kubernetes/kubernetes/issues/83550).
+- Fix [errors caused by grpc changing balancer/resolver API](https://github.com/etcd-io/etcd/pull/11564). This change is compatible with grpc> = 1.27.0 and is no longer compatible with grpc < 1.27.0.
 
 ### etcdctl v3
 

From d94f4cacf247adf894e3a73a62cb33ab9ea800cb Mon Sep 17 00:00:00 2001
From: EDDYCJY <313687982@qq.com>
Date: Wed, 19 Feb 2020 17:19:17 +0800
Subject: [PATCH 2/2] CHANGELOG-3.5: update from 11564

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

diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index fcae3b95554..0f08c295054 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -103,7 +103,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
   - Fix ["kube-apiserver: failover on multi-member etcd cluster fails certificate check on DNS mismatch" (kubernetes#83028)](https://github.com/kubernetes/kubernetes/issues/83028).
 - Fix [IPv6 endpoint parsing in client](https://github.com/etcd-io/etcd/pull/11211).
   - Fix ["1.16: etcd client does not parse IPv6 addresses correctly when members are joining" (kubernetes#83550)](https://github.com/kubernetes/kubernetes/issues/83550).
-- Fix [errors caused by grpc changing balancer/resolver API](https://github.com/etcd-io/etcd/pull/11564). This change is compatible with grpc> = 1.27.0 and is no longer compatible with grpc < 1.27.0.
+- Fix [errors caused by grpc changing balancer/resolver API](https://github.com/etcd-io/etcd/pull/11564). This change is compatible with grpc >= [v1.26.0](https://github.com/grpc/grpc-go/releases/tag/v1.26.0), but is not compatible with < v1.26.0 version.
 - Use [ServerName as the authority](https://github.com/etcd-io/etcd/pull/11574) after bumping to grpc v1.26.0. Remove workaround in [#11184](https://github.com/etcd-io/etcd/pull/11184).
 
 ### etcdctl v3