resolve merge conflicts

Azure · Jun 28, 2024 · 85bbb7c · 85bbb7c
1 parent 064d7e0
commit 85bbb7c
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst
@@ -14,8 +14,7 @@ Pending
 
 5.0.0b3
 ++++++++
-* Add option `--enable-high-log-scale-mode` to `az aks create --enable-addons monitoring` and `az aks enable-addons -a monitoring` .
-* Add option `--ampls-resource-id` to `az aks create --enable-addons monitoring` and `az aks enable-addons -a monitoring` .
+* Add support for mutable fips in agentpool update. (enable/disable flags)
 
 5.0.0b2
 ++++++++