From 7bde0f5e7654498815ed6d90339d0d69b2cf540a Mon Sep 17 00:00:00 2001
From: Takeshi Yoneda <takeshi@tetrate.io>
Date: Wed, 27 Oct 2021 15:52:20 +0900
Subject: [PATCH] Kick-off release 1.20.1 (#18658)

Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
---
 VERSION                                       | 2 +-
 docs/root/version_history/current.rst         | 8 ++++++++
 docs/root/version_history/version_history.rst | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 3500250a4b05..637015738c2a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.21.0
+1.20.1-dev
diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst
index e63d73ae4a31..e6d6e9ec5755 100644
--- a/docs/root/version_history/current.rst
+++ b/docs/root/version_history/current.rst
@@ -1,5 +1,7 @@
 1.21.0 (January 12, 2022)
 =========================
+1.20.1 (Pending)
+========================
 
 Incompatible Behavior Changes
 -----------------------------
@@ -37,6 +39,7 @@ Bug Fixes
 * tcp: fixing a log error where errors both from the kernel and the transport were not handled gracefully.
 * thrift_proxy: do not close downstream connections when an upstream connection overflow happens.
 * thrift_proxy: fix the thrift_proxy connection manager to correctly report success/error response metrics when performing :ref:`payload passthrough <envoy_v3_api_field_extensions.filters.network.thrift_proxy.v3.ThriftProxy.payload_passthrough>`.
+* listener: fix a crash when updating any listener that does not bind to port.
 
 Removed Config or Runtime
 -------------------------
@@ -124,3 +127,8 @@ Deprecated
 * dns_cache: :ref:`dns_resolution_config <envoy_v3_api_field_extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig.dns_resolution_config>` is deprecated in favor of :ref:`typed_dns_resolver_config <envoy_v3_api_field_extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig.typed_dns_resolver_config>`.
 * tls: :ref:`match_subject_alt_names <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_subject_alt_names>` has been deprecated in favor of the :ref:`match_typed_subject_alt_names <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_typed_subject_alt_names>`.
 * dns_filter: :ref:`dns_resolution_config <envoy_v3_api_field_extensions.filters.udp.dns_filter.v3.DnsFilterConfig.ClientContextConfig.dns_resolution_config>` is deprecated in favor of :ref:`typed_dns_resolver_config <envoy_v3_api_field_extensions.filters.udp.dns_filter.v3.DnsFilterConfig.ClientContextConfig.typed_dns_resolver_config>`.
+New Features
+------------
+
+Deprecated
+----------
diff --git a/docs/root/version_history/version_history.rst b/docs/root/version_history/version_history.rst
index 006173c8ade0..7cca61970b5b 100644
--- a/docs/root/version_history/version_history.rst
+++ b/docs/root/version_history/version_history.rst
@@ -7,7 +7,6 @@ Version history
   :titlesonly:
 
   current
-  v1.20.1
   v1.20.0
   v1.19.1
   v1.19.0