rebase

src/aks-preview/HISTORY.rst

@@ -9,8 +9,9 @@ If there is no rush to release a new version, please just add a description of t
 
 To release a new version, please select a new version number (usually plus 1 to last patch version, X.Y.Z -> Major.Minor.Patch, more details in `\doc <https://semver.org/>`_), and then add a new section named as the new version number in this file, the content should include the new modifications and everything from the *Pending* section. Finally, update the `VERSION` variable in `setup.py` with this new version number.
 
-Pending
+7.0.0b5
 +++++++
+* Add option `--enable-fqdn-policy`, `--disable-fqdn-policy` to `az aks create/update`
 * az aks create/update: Support in place param updates for managed prom
 * Vendor new SDK and bump API version to 2024-06-02-preview.
 
@@ -19,10 +20,6 @@ Pending
 * Fix bug related to the --ampls-resource-id option in the `az aks enable-addons` command.
 * Vendor new SDK and bump API version to 2024-06-02-preview.
 
-7.0.0b4
-++++++++
-* Add option `--enable-fqdn-policy`, `--disable-fqdn-policy` to `az aks create/update`
-
 7.0.0b3
 ++++++++
 * Add option `--enable-high-log-scale-mode` to `az aks create --enable-addons monitoring` and `az aks enable-addons -a monitoring`.