From be37cd23f42c50b2b6478715fb96727f0daa3d89 Mon Sep 17 00:00:00 2001 From: Yan Xu Date: Tue, 14 Jan 2025 18:55:32 +0800 Subject: [PATCH] fix ChangeLog.md (#27006) --- src/Automation/Automation/ChangeLog.md | 5 +---- src/Compute/Compute/ChangeLog.md | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Automation/Automation/ChangeLog.md b/src/Automation/Automation/ChangeLog.md index 8b3c230e40c2..def756e47f91 100644 --- a/src/Automation/Automation/ChangeLog.md +++ b/src/Automation/Automation/ChangeLog.md @@ -18,12 +18,9 @@ - Additional information about change #1 --> ## Upcoming Release -<<<<<<< HEAD +* Fixed Bug: Start-AzAutomationRunbook throws object reference error when the automation account is not available in the subscription ## Version 1.11.0 -======= -* Fixed Bug: Start-AzAutomationRunbook throws object reference error when the automation account is not available in the subscription ->>>>>>> origin/main * Upgraded nuget package to signed package. ## Version 1.10.0 diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md index 1d251db7621c..6f5a58c903bc 100644 --- a/src/Compute/Compute/ChangeLog.md +++ b/src/Compute/Compute/ChangeLog.md @@ -20,13 +20,13 @@ --> ## Upcoming Release +* Added new parameter `EncryptionIdentity` to cmdlet `Set-AzVMDiskEncryptionExtension` +* Added new parameter `EncryptionIdentity` to cmdlet `New-AzVMConfig` ## Version 9.0.1 * Upgraded nuget package to signed package. * Upgraded Azure.Core to 1.44.1. * Compute gallery related cmdlets will now use 2024-03-03 GalleryRP API calls. -* Added new parameter `EncryptionIdentity` to cmdlet `Set-AzVMDiskEncryptionExtension` -* Added new parameter `EncryptionIdentity` to cmdlet `New-AzVMConfig` ## Version 9.0.0 * Made `-PublicIpSku` parameter Standard by default in `New-AzVM`