From 9171f6380d82a828578722dca2df546abf94f409 Mon Sep 17 00:00:00 2001
From: Azure CLI Team <AzPyCLI@microsoft.com>
Date: Fri, 19 Mar 2021 04:57:32 +0000
Subject: [PATCH 01/29] update azure-cli version to 2.21.0

---
 src/azure-cli-core/HISTORY.rst                |   5 +
 src/azure-cli-core/azure/cli/core/__init__.py |   2 +-
 src/azure-cli-core/setup.py                   |   2 +-
 src/azure-cli/HISTORY.rst                     | 126 ++++++++++++++++++
 src/azure-cli/azure/cli/__main__.py           |   2 +-
 src/azure-cli/requirements.py3.Darwin.txt     |   4 +-
 src/azure-cli/requirements.py3.Linux.txt      |   4 +-
 src/azure-cli/requirements.py3.windows.txt    |   4 +-
 src/azure-cli/setup.py                        |   2 +-
 9 files changed, 141 insertions(+), 10 deletions(-)

diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
index a7df8df62b0..bef85909a2e 100644
--- a/src/azure-cli-core/HISTORY.rst
+++ b/src/azure-cli-core/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+2.21.0
+++++++
+* Unify ADAL and MSAL error handler (#17072)
+* Add support for specifying minimum required version of an extension to work with the current core version (#16751)
+
 2.20.0
 ++++++
 * Minor fixes
diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
index c2b62d8b81d..ec34afbd1de 100644
--- a/src/azure-cli-core/azure/cli/core/__init__.py
+++ b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -6,7 +6,7 @@
 
 from __future__ import print_function
 
-__version__ = "2.20.0"
+__version__ = "2.21.0"
 
 import os
 import sys
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index 74668797eb4..297b25a3f4b 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "2.20.0"
+VERSION = "2.21.0"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index cee49eaa63a..f2fb74668b6 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -3,6 +3,132 @@
 Release History
 ===============
 
+2.21.0
+++++++
+
+**ACR**
+
+* Output a trace in "az acr login" for self-diagnosing potential docker command latency (#17115)
+* Fix a bug when run check-health behind corporate proxy (#17177)
+* Support anonymous pull (#17006)
+* Fix#16700: Use "exists" api to check storage blob existence (#17299)
+
+**AKS**
+
+* Add --no-uptime-sla (#17192)
+* Fix cross-sub assigning identity error and attach acr error (#17281)
+* Add support for node public IP prefix ID (#17138)
+
+**APIM**
+
+* [BREAKING CHANGE] `apim backup`: `--storage-account-container` not support multi-value. (#17315)
+* [BREAKING CHANGE] `apim restore`: `--storage-account-container` not support multi-value. (#17315)
+
+**App Service**
+
+* [BREAKING CHANGE] Fixes #16087:az webapp config ssl create  setting --name parameter as required. (#17079)
+* : fix #17053- `az webapp show` returning null values for SiteConfig properties (#17054)
+* : fix #17207 - for az webapp log config 'level' always defaults to verbose (#17259)
+
+**ARM**
+
+* `az bicep build`: fix an issue where build warnings are not shown (#17180)
+
+**Backup**
+
+* Added id_part for sub-resource names (#17165)
+* Fix #17094: Created separate test suite for CRR tests (#17183)
+* `az backup protection check-vm`: Add vm and resource-group as optional params (#16974)
+
+**Cache**
+
+* GA `az cache` (#17264)
+
+**CDN**
+
+* `az afd rule create`: Fix '--help' message (#17282)
+
+**Compute**
+
+* Fix a Windows vm user update bug (#17257)
+* Fix #16585: az vmss deallocate --instance-ids failed (#17274)
+* vm create: New parameter --platform-fault-domain in FLEX VMSS mode (#16409)
+* vm create: --patch-mode for Linux VM (#16409)
+* `az ssh vm`: Automatically launch browser when getting certificate fails (#17093)
+* vm create: New parameter --count (#17217)
+* vm create: Trusted Launch (#17354)
+
+**Extension**
+
+* Add actionable message when an extension is not compatible with the CLI core (#16751)
+
+**Key Vault**
+
+* `az keyvault role definition list`: Support `--custom-role-only` to list only custom role definitions (#17119)
+* Support keyvault custom role definition (#17109)
+* Add `--no-wait` for command `az keyvault security-domain download` and `--target-operation` for command `az keyvault security-domain wait` (#17263)
+
+**NetAppFiles**
+
+* `az netappfiles account backup show`: Operation added. (#17173)
+* `az netappfiles account backup delete`: Operation added. (#17173)
+* `az netappfiles account ad add`: Parameter ldap-over-tls added. (#17173)
+* `az netappfiles account create`: Parameter encryption added. (#17173)
+* `az netappfiles account update`: Parameter encryption added. (#17173)
+* `az netappfiles volume create`: Parameter encryption-key-source added. (#17173)
+* `az netappfiles volume create`: Default export policy removed for nfsv4.1 and optional parameters added for setting up an export policy for nfsv4.1: rule_index, unix_read_only, unix_read_write, cifs, allowed_clients (#17173)
+
+**Network**
+
+* `az network public-ip prefix  create`: Support `--zone 1 2 3` (#17279)
+* `az network lb  frontend-ip create`: Support `--zone 1 2 3` (#17279)
+* Bump version from '2020-08-01' to '2020-11-01' (#17290)
+* `az network lb address-pool` : Support subnet when creating or updating an IP-based backend pool of a load balancer. (#17336)
+
+**Packaging**
+
+* Add azure-identity dependency (#17277)
+
+**RDBMS**
+
+* Added tests for flexible server team pipeline (#16947)
+* Python SDK migration (#17191)
+* Added PostgreSQL database create, show, and delete feature (#17271)
+* Updating Python SDK to 8.1.0b2 (#17359)
+
+**Role**
+
+* `az ad app permission list/grant`: Refine error message when no associated Service Principal exists for the App (#17051)
+
+**Search**
+
+* `az search`: GA (#17258)
+
+**Service Fabric**
+
+* `az sf certificate`: deprecate cluster cert commands. (#17190)
+
+**SQL**
+
+* Add Server Trust Group commands (#17275)
+
+**Storage**
+
+* Fix #16917: az storage account generate-sas fails if a connection string is provided (#17200)
+* Fix #16979: `az storage container create` fails when providing storage container metadata (#17202)
+
+**Style**
+
+* Allow configuring theme (#17073)
+
+**Upgrade**
+
+* Fix 16952: Fix ImportError after upgrade (#17314)
+
+**VM**
+
+* Add #16037: az vm open-port accepts list of ports (#17255)
+
 2.20.0
 ++++++
 
diff --git a/src/azure-cli/azure/cli/__main__.py b/src/azure-cli/azure/cli/__main__.py
index 2953494d5db..36ccb5d9d55 100644
--- a/src/azure-cli/azure/cli/__main__.py
+++ b/src/azure-cli/azure/cli/__main__.py
@@ -17,7 +17,7 @@
 from knack.log import get_logger
 
 __author__ = "Microsoft Corporation <python@microsoft.com>"
-__version__ = "2.20.0"
+__version__ = "2.21.0"
 
 
 # A workaround for https://bugs.python.org/issue32502 (https://github.com/Azure/azure-cli/issues/5184)
diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
index c8fd541e9e3..7d5f6848484 100644
--- a/src/azure-cli/requirements.py3.Darwin.txt
+++ b/src/azure-cli/requirements.py3.Darwin.txt
@@ -5,9 +5,9 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli-core==2.20.0
+azure-cli-core==2.21.0
 azure-cli-telemetry==1.0.6
-azure-cli==2.20.0
+azure-cli==2.21.0
 azure-common==1.1.22
 azure-core==1.10.0
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
index cfd1667555b..05310ac2f42 100644
--- a/src/azure-cli/requirements.py3.Linux.txt
+++ b/src/azure-cli/requirements.py3.Linux.txt
@@ -5,9 +5,9 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli-core==2.20.0
+azure-cli-core==2.21.0
 azure-cli-telemetry==1.0.6
-azure-cli==2.20.0
+azure-cli==2.21.0
 azure-common==1.1.22
 azure-core==1.10.0
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
index 4f8216068b1..5d019828830 100644
--- a/src/azure-cli/requirements.py3.windows.txt
+++ b/src/azure-cli/requirements.py3.windows.txt
@@ -5,9 +5,9 @@ argcomplete==1.11.1
 asn1crypto==0.24.0
 azure-appconfiguration==1.1.1
 azure-batch==10.0.0
-azure-cli-core==2.20.0
+azure-cli-core==2.21.0
 azure-cli-telemetry==1.0.6
-azure-cli==2.20.0
+azure-cli==2.21.0
 azure-common==1.1.22
 azure-core==1.10.0
 azure-cosmos==3.2.0
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index 43d1ba1106e..c195d9485a2 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -18,7 +18,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.20.0"
+VERSION = "2.21.0"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try:

From d4cb625137209c91316e22e2757885e3759fd425 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:02:18 +0800
Subject: [PATCH 02/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index f2fb74668b6..f3f9cb1650f 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -8,7 +8,7 @@ Release History
 
 **ACR**
 
-* Output a trace in "az acr login" for self-diagnosing potential docker command latency (#17115)
+* Output a trace in `az acr login` for self-diagnosing potential docker command latency (#17115)
 * Fix a bug when run check-health behind corporate proxy (#17177)
 * Support anonymous pull (#17006)
 * Fix#16700: Use "exists" api to check storage blob existence (#17299)

From ee8df03c70f121ae0262768bf23dfd5e96b6ba20 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:02:47 +0800
Subject: [PATCH 03/29] Update src/azure-cli/HISTORY.rst

Co-authored-by: Yishi Wang <yishiwang@microsoft.com>
---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index f3f9cb1650f..47da122e170 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -11,7 +11,7 @@ Release History
 * Output a trace in `az acr login` for self-diagnosing potential docker command latency (#17115)
 * Fix a bug when run check-health behind corporate proxy (#17177)
 * Support anonymous pull (#17006)
-* Fix#16700: Use "exists" api to check storage blob existence (#17299)
+* Fix #16700: Use "exists" api to check storage blob existence (#17299)
 
 **AKS**
 

From dcc0f2f7953d9e6696dfb494538f4bc19ca8f692 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:04:05 +0800
Subject: [PATCH 04/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 47da122e170..e7f83dafca1 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -15,7 +15,7 @@ Release History
 
 **AKS**
 
-* Add --no-uptime-sla (#17192)
+* `aks update`: Add `--no-uptime-sla` (#17192)
 * Fix cross-sub assigning identity error and attach acr error (#17281)
 * Add support for node public IP prefix ID (#17138)
 

From 3237d519a9d4906da74154ff4a99baadc2bbc5fc Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:05:05 +0800
Subject: [PATCH 05/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index e7f83dafca1..06ab1654b21 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -10,7 +10,7 @@ Release History
 
 * Output a trace in `az acr login` for self-diagnosing potential docker command latency (#17115)
 * Fix a bug when run check-health behind corporate proxy (#17177)
-* Support anonymous pull (#17006)
+* `acr update`: Support anonymous pull (#17006)
 * Fix #16700: Use "exists" api to check storage blob existence (#17299)
 
 **AKS**

From 28d4adc9bf6cf05de0d79d714fc5b26686b4d14c Mon Sep 17 00:00:00 2001
From: Feiyue Yu <fey@microsoft.com>
Date: Fri, 19 Mar 2021 13:05:16 +0800
Subject: [PATCH 06/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 06ab1654b21..ef1bacbf12c 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -125,10 +125,6 @@ Release History
 
 * Fix 16952: Fix ImportError after upgrade (#17314)
 
-**VM**
-
-* Add #16037: az vm open-port accepts list of ports (#17255)
-
 2.20.0
 ++++++
 

From e17b17f821332def1e60c1434542c717e2206da9 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:05:27 +0800
Subject: [PATCH 07/29] Update src/azure-cli/HISTORY.rst

Co-authored-by: Yishi Wang <yishiwang@microsoft.com>
---
 src/azure-cli/HISTORY.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index ef1bacbf12c..98aa8de5e58 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -52,11 +52,11 @@ Release History
 
 * Fix a Windows vm user update bug (#17257)
 * Fix #16585: az vmss deallocate --instance-ids failed (#17274)
-* vm create: New parameter --platform-fault-domain in FLEX VMSS mode (#16409)
-* vm create: --patch-mode for Linux VM (#16409)
+* `az vm create`: New parameter --platform-fault-domain in FLEX VMSS mode (#16409)
+* `az vm create`: --patch-mode for Linux VM (#16409)
 * `az ssh vm`: Automatically launch browser when getting certificate fails (#17093)
-* vm create: New parameter --count (#17217)
-* vm create: Trusted Launch (#17354)
+* `az vm create`: New parameter --count (#17217)
+* `az vm create`: Trusted Launch (#17354)
 
 **Extension**
 

From 2c18a150fa4fdaeb1de88203a65e4f54609dd4e1 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:05:53 +0800
Subject: [PATCH 08/29] Update src/azure-cli/HISTORY.rst

Co-authored-by: Yishi Wang <yishiwang@microsoft.com>
---
 src/azure-cli/HISTORY.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 98aa8de5e58..468b6bfba86 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -27,8 +27,8 @@ Release History
 **App Service**
 
 * [BREAKING CHANGE] Fixes #16087:az webapp config ssl create  setting --name parameter as required. (#17079)
-* : fix #17053- `az webapp show` returning null values for SiteConfig properties (#17054)
-* : fix #17207 - for az webapp log config 'level' always defaults to verbose (#17259)
+* Fix #17053: `az webapp show` returning null values for SiteConfig properties (#17054)
+* Fix #17207: for az webapp log config 'level' always defaults to verbose (#17259)
 
 **ARM**
 

From 2d334ae261d0aa67c279071043ac2dee843ad2af Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:06:05 +0800
Subject: [PATCH 09/29] Update src/azure-cli/HISTORY.rst

Co-authored-by: Feng Zhou <55177366+fengzhou-msft@users.noreply.github.com>
---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 468b6bfba86..76ba86be39c 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -36,7 +36,7 @@ Release History
 
 **Backup**
 
-* Added id_part for sub-resource names (#17165)
+* Add `id_part` for sub-resource names to fix `--ids` (#17165)
 * Fix #17094: Created separate test suite for CRR tests (#17183)
 * `az backup protection check-vm`: Add vm and resource-group as optional params (#16974)
 

From 606976c393f354248d0c475ccc473d59a25d213d Mon Sep 17 00:00:00 2001
From: Feiyue Yu <fey@microsoft.com>
Date: Fri, 19 Mar 2021 13:17:58 +0800
Subject: [PATCH 10/29] Update src/azure-cli-core/HISTORY.rst

---
 src/azure-cli-core/HISTORY.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
index bef85909a2e..d48a2460cdd 100644
--- a/src/azure-cli-core/HISTORY.rst
+++ b/src/azure-cli-core/HISTORY.rst
@@ -7,6 +7,7 @@ Release History
 ++++++
 * Unify ADAL and MSAL error handler (#17072)
 * Add support for specifying minimum required version of an extension to work with the current core version (#16751)
+* Allow configuring theme (#17073)
 
 2.20.0
 ++++++

From 39c63df3d1f9d3225d4d33f1903510e7d64f3e58 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:18:28 +0800
Subject: [PATCH 11/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 76ba86be39c..e1903663a0f 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -9,7 +9,7 @@ Release History
 **ACR**
 
 * Output a trace in `az acr login` for self-diagnosing potential docker command latency (#17115)
-* Fix a bug when run check-health behind corporate proxy (#17177)
+* Fix #17172: When run check-health behind corporate proxy (#17177)
 * `acr update`: Support anonymous pull (#17006)
 * Fix #16700: Use "exists" api to check storage blob existence (#17299)
 

From 3b7716605691e9e52a62b130b86731b64c2b9bd9 Mon Sep 17 00:00:00 2001
From: Feiyue Yu <fey@microsoft.com>
Date: Fri, 19 Mar 2021 13:18:31 +0800
Subject: [PATCH 12/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index e1903663a0f..2dc1a8f9805 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -117,10 +117,6 @@ Release History
 * Fix #16917: az storage account generate-sas fails if a connection string is provided (#17200)
 * Fix #16979: `az storage container create` fails when providing storage container metadata (#17202)
 
-**Style**
-
-* Allow configuring theme (#17073)
-
 **Upgrade**
 
 * Fix 16952: Fix ImportError after upgrade (#17314)

From 772d518b333d0098550b7a3235b98e497a298ead Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:19:58 +0800
Subject: [PATCH 13/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 2dc1a8f9805..2fd231ba14a 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -38,7 +38,7 @@ Release History
 
 * Add `id_part` for sub-resource names to fix `--ids` (#17165)
 * Fix #17094: Created separate test suite for CRR tests (#17183)
-* `az backup protection check-vm`: Add vm and resource-group as optional params (#16974)
+* `az backup protection check-vm`: Add `--vm` and `--resource-group` as optional params (#16974)
 
 **Cache**
 

From 50fc446f033591852b075c14e51b1c98351b2d03 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:20:10 +0800
Subject: [PATCH 14/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 2fd231ba14a..c425a985c27 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -46,7 +46,7 @@ Release History
 
 **CDN**
 
-* `az afd rule create`: Fix '--help' message (#17282)
+* `az afd rule create`: Fix `--help` message (#17282)
 
 **Compute**
 

From a0cc939c803350b4858c99bcc6535502be8cb3a3 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:20:50 +0800
Subject: [PATCH 15/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index c425a985c27..1a9c7dec4c0 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -26,7 +26,7 @@ Release History
 
 **App Service**
 
-* [BREAKING CHANGE] Fixes #16087:az webapp config ssl create  setting --name parameter as required. (#17079)
+* [BREAKING CHANGE] Fixes #16087: `az webapp config ssl create`: set `--name` parameter as required. (#17079)
 * Fix #17053: `az webapp show` returning null values for SiteConfig properties (#17054)
 * Fix #17207: for az webapp log config 'level' always defaults to verbose (#17259)
 

From d377e92076c95e44bd71366ec6cf1f8d18533b5a Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:20:58 +0800
Subject: [PATCH 16/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 1a9c7dec4c0..f781e7507e2 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -28,7 +28,7 @@ Release History
 
 * [BREAKING CHANGE] Fixes #16087: `az webapp config ssl create`: set `--name` parameter as required. (#17079)
 * Fix #17053: `az webapp show` returning null values for SiteConfig properties (#17054)
-* Fix #17207: for az webapp log config 'level' always defaults to verbose (#17259)
+* Fix #17207: `az webapp log config`: 'level' always defaults to verbose (#17259)
 
 **ARM**
 

From fa5ed419e38eb15b9016e46b2600ff748c951d6a Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:21:31 +0800
Subject: [PATCH 17/29] Update src/azure-cli/HISTORY.rst

Co-authored-by: Feng Zhou <55177366+fengzhou-msft@users.noreply.github.com>
---
 src/azure-cli/HISTORY.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index f781e7507e2..978fd1b6b84 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -57,6 +57,7 @@ Release History
 * `az ssh vm`: Automatically launch browser when getting certificate fails (#17093)
 * `az vm create`: New parameter --count (#17217)
 * `az vm create`: Trusted Launch (#17354)
+* Fix #16037: az vm open-port accepts list of ports (#17255)
 
 **Extension**
 

From c53348b65f13acfc559b98e49d8c158edcb4845a Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:21:40 +0800
Subject: [PATCH 18/29] Update src/azure-cli/HISTORY.rst

Co-authored-by: Feng Zhou <55177366+fengzhou-msft@users.noreply.github.com>
---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 978fd1b6b84..6c1712fba6b 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -120,7 +120,7 @@ Release History
 
 **Upgrade**
 
-* Fix 16952: Fix ImportError after upgrade (#17314)
+* Fix #16952: Fix ImportError after upgrade (#17314)
 
 2.20.0
 ++++++

From 1f193d25077cdf3a5df9b4ece050086287ea7d96 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:22:14 +0800
Subject: [PATCH 19/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 6c1712fba6b..16ffe9dd85c 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -51,7 +51,7 @@ Release History
 **Compute**
 
 * Fix a Windows vm user update bug (#17257)
-* Fix #16585: az vmss deallocate --instance-ids failed (#17274)
+* Fix #16585: `az vmss deallocate`: `--instance-ids` failed (#17274)
 * `az vm create`: New parameter --platform-fault-domain in FLEX VMSS mode (#16409)
 * `az vm create`: --patch-mode for Linux VM (#16409)
 * `az ssh vm`: Automatically launch browser when getting certificate fails (#17093)

From 78dd4727944ee8bc75c21fcbf5de81af50806b97 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:22:30 +0800
Subject: [PATCH 20/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 16ffe9dd85c..8b1b39347af 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -53,9 +53,9 @@ Release History
 * Fix a Windows vm user update bug (#17257)
 * Fix #16585: `az vmss deallocate`: `--instance-ids` failed (#17274)
 * `az vm create`: New parameter --platform-fault-domain in FLEX VMSS mode (#16409)
-* `az vm create`: --patch-mode for Linux VM (#16409)
+* `az vm create`: `--patch-mode` for Linux VM (#16409)
 * `az ssh vm`: Automatically launch browser when getting certificate fails (#17093)
-* `az vm create`: New parameter --count (#17217)
+* `az vm create`: New parameter `--count` (#17217)
 * `az vm create`: Trusted Launch (#17354)
 * Fix #16037: az vm open-port accepts list of ports (#17255)
 

From c3fc25c0f0d48948496beee5e54669996a0bbe67 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:22:40 +0800
Subject: [PATCH 21/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 8b1b39347af..44f8fe0b6dd 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -73,7 +73,7 @@ Release History
 
 * `az netappfiles account backup show`: Operation added. (#17173)
 * `az netappfiles account backup delete`: Operation added. (#17173)
-* `az netappfiles account ad add`: Parameter ldap-over-tls added. (#17173)
+* `az netappfiles account ad add`: Parameter `--ldap-over-tls` added. (#17173)
 * `az netappfiles account create`: Parameter encryption added. (#17173)
 * `az netappfiles account update`: Parameter encryption added. (#17173)
 * `az netappfiles volume create`: Parameter encryption-key-source added. (#17173)

From 0b806c26423ffd53996d172b72d93afcbed5209c Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:22:50 +0800
Subject: [PATCH 22/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 44f8fe0b6dd..f52cc93ebd2 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -74,9 +74,9 @@ Release History
 * `az netappfiles account backup show`: Operation added. (#17173)
 * `az netappfiles account backup delete`: Operation added. (#17173)
 * `az netappfiles account ad add`: Parameter `--ldap-over-tls` added. (#17173)
-* `az netappfiles account create`: Parameter encryption added. (#17173)
-* `az netappfiles account update`: Parameter encryption added. (#17173)
-* `az netappfiles volume create`: Parameter encryption-key-source added. (#17173)
+* `az netappfiles account create`: Parameter `--encryption` added. (#17173)
+* `az netappfiles account update`: Parameter `--encryption` added. (#17173)
+* `az netappfiles volume create`: Parameter `--encryption-key-source` added. (#17173)
 * `az netappfiles volume create`: Default export policy removed for nfsv4.1 and optional parameters added for setting up an export policy for nfsv4.1: rule_index, unix_read_only, unix_read_write, cifs, allowed_clients (#17173)
 
 **Network**

From 991cd45e6d5c2718bb7feabd5596c3c1dc84b2b0 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:23:05 +0800
Subject: [PATCH 23/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index f52cc93ebd2..9344387d5b1 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -115,7 +115,7 @@ Release History
 
 **Storage**
 
-* Fix #16917: az storage account generate-sas fails if a connection string is provided (#17200)
+* Fix #16917: `az storage account generate-sas` fails if a connection string is provided (#17200)
 * Fix #16979: `az storage container create` fails when providing storage container metadata (#17202)
 
 **Upgrade**

From e1c0e5a689f2dc6fa5f13ff113dfca18bb3cb963 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:23:12 +0800
Subject: [PATCH 24/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 9344387d5b1..4c8689a9817 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -52,7 +52,7 @@ Release History
 
 * Fix a Windows vm user update bug (#17257)
 * Fix #16585: `az vmss deallocate`: `--instance-ids` failed (#17274)
-* `az vm create`: New parameter --platform-fault-domain in FLEX VMSS mode (#16409)
+* `az vm create`: New parameter `--platform-fault-domain` in FLEX VMSS mode (#16409)
 * `az vm create`: `--patch-mode` for Linux VM (#16409)
 * `az ssh vm`: Automatically launch browser when getting certificate fails (#17093)
 * `az vm create`: New parameter `--count` (#17217)

From 38abd3dee4b9a9b013a87596e348ae2f23862177 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:36:18 +0800
Subject: [PATCH 25/29] Update HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 4c8689a9817..e17fd152525 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -27,7 +27,7 @@ Release History
 **App Service**
 
 * [BREAKING CHANGE] Fixes #16087: `az webapp config ssl create`: set `--name` parameter as required. (#17079)
-* Fix #17053: `az webapp show` returning null values for SiteConfig properties (#17054)
+* Fix #17053: `az webapp show` return null values for SiteConfig properties (#17054)
 * Fix #17207: `az webapp log config`: 'level' always defaults to verbose (#17259)
 
 **ARM**
@@ -81,10 +81,10 @@ Release History
 
 **Network**
 
-* `az network public-ip prefix  create`: Support `--zone 1 2 3` (#17279)
-* `az network lb  frontend-ip create`: Support `--zone 1 2 3` (#17279)
+* `az network public-ip prefix create`: Support `--zone 1 2 3` (#17279)
+* `az network lb frontend-ip create`: Support `--zone 1 2 3` (#17279)
 * Bump version from '2020-08-01' to '2020-11-01' (#17290)
-* `az network lb address-pool` : Support subnet when creating or updating an IP-based backend pool of a load balancer. (#17336)
+* `az network lb address-pool`: Support subnet when creating or updating an IP-based backend pool of a load balancer. (#17336)
 
 **Packaging**
 
@@ -122,6 +122,11 @@ Release History
 
 * Fix #16952: Fix ImportError after upgrade (#17314)
 
+**Misc.**
+
+* Allow configuring theme (#17073)
+
+
 2.20.0
 ++++++
 
@@ -134,7 +139,7 @@ Release History
 * Update module to use 2020 Azure Media Services api. (#16492)
 * `az ams account encryption`: New subgroup to show or set the encryption for the media service account (#16492)
 * `az ams account storage set-authentication`: New command to set the authentication for the storage account associated with the media service account (#16492)
-* `az ams account create (mi-system-assigned)`: New --mi-system-assigned parameter for account create to set the managed identity of the media account (#16492)
+* `az ams account create (mi-system-assigned)`: New `--mi-system-assigned` parameter for account create to set the managed identity of the media account (#16492)
 * `az ams account mru set`: This command will no longer work for Media Services accounts that are created with the 2020-05-01 version of the API or later. (#16492)
 * `az ams live-event create (stretch-mode, key-frame-interval, transcrip-lang, use-static-hostname, custom hostname)`: Add new parameter options to live-event create command (#16492)
 * `az ams live-event standby`: New command to put the live event in standby mode (#16492)
@@ -197,14 +202,14 @@ Release History
 **Network**
 
 * Bump version from '2020-07-01' to '2020-08-01' (#16889)
-* `az network public-ip create`: Support '--zone 1 2 3' after '2020-08-01' (#17043)
+* `az network public-ip create`: Support `--zone 1 2 3` after '2020-08-01' (#17043)
 * `az network routeserver peering`: Rename `--vrouter-name` by `--routeserver` (#17049)
 * `az network express-route peering create`: Support ipv6 address (#17048)
 * `az network public-ip create`: Expose a new argument `--tier` (#17069)
 
 **OpenShift**
 
-* Update of az openshift deprecation warning (#16604)
+* Update of `az openshift` deprecation warning (#16604)
 
 **Search**
 
@@ -212,9 +217,9 @@ Release History
 
 **SQL**
 
-* Update az sql mi examples (#16852)
-* `az sql db/elastic-pool create/update`: Add maintenance-configuration argument (#16915)
-* `az sql db replica create`: Add --secondary-type argument (#16960)
+* Update `az sql mi` examples (#16852)
+* `az sql db/elastic-pool create/update`: Add `maintenance-configuration` argument (#16915)
+* `az sql db replica create`: Add `--secondary-type` argument (#16960)
 
 **Storage**
 

From 3ee78fee70c108772982b75e823d9e709bb66d04 Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:36:27 +0800
Subject: [PATCH 26/29] Update src/azure-cli-core/HISTORY.rst

---
 src/azure-cli-core/HISTORY.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
index d48a2460cdd..bef85909a2e 100644
--- a/src/azure-cli-core/HISTORY.rst
+++ b/src/azure-cli-core/HISTORY.rst
@@ -7,7 +7,6 @@ Release History
 ++++++
 * Unify ADAL and MSAL error handler (#17072)
 * Add support for specifying minimum required version of an extension to work with the current core version (#16751)
-* Allow configuring theme (#17073)
 
 2.20.0
 ++++++

From b5477481b8f09c4723466822f4a11c1f7949564b Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:37:54 +0800
Subject: [PATCH 27/29] Update src/azure-cli/HISTORY.rst

Co-authored-by: Feiyue Yu <fey@microsoft.com>
---
 src/azure-cli/HISTORY.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index e17fd152525..8d9d85a7502 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -86,10 +86,6 @@ Release History
 * Bump version from '2020-08-01' to '2020-11-01' (#17290)
 * `az network lb address-pool`: Support subnet when creating or updating an IP-based backend pool of a load balancer. (#17336)
 
-**Packaging**
-
-* Add azure-identity dependency (#17277)
-
 **RDBMS**
 
 * Added tests for flexible server team pipeline (#16947)

From 16dfadbc466a1786ed0ca318ff59d80a4adf90ac Mon Sep 17 00:00:00 2001
From: kai ru <69238381+kairu-ms@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:38:14 +0800
Subject: [PATCH 28/29] Update src/azure-cli/HISTORY.rst

---
 src/azure-cli/HISTORY.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 8d9d85a7502..5870d4580b1 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -122,7 +122,6 @@ Release History
 
 * Allow configuring theme (#17073)
 
-
 2.20.0
 ++++++
 

From 8912ba193862128b4933c2d537e39d1c52bfcb3e Mon Sep 17 00:00:00 2001
From: Feng Zhou <55177366+fengzhou-msft@users.noreply.github.com>
Date: Fri, 19 Mar 2021 13:40:40 +0800
Subject: [PATCH 29/29] Apply suggestions from code review

---
 src/azure-cli/HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 5870d4580b1..0cc47f9f761 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -26,7 +26,7 @@ Release History
 
 **App Service**
 
-* [BREAKING CHANGE] Fixes #16087: `az webapp config ssl create`: set `--name` parameter as required. (#17079)
+* [BREAKING CHANGE] Fix #16087: `az webapp config ssl create`: set `--name` parameter as required. (#17079)
 * Fix #17053: `az webapp show` return null values for SiteConfig properties (#17054)
 * Fix #17207: `az webapp log config`: 'level' always defaults to verbose (#17259)