Skip to content

Commit 84debaa

Browse files
rane-rajasirane-rajasi
committed
Fixing merge conflicts
2 parents effd029 + e702b91 commit 84debaa

7 files changed

+620
-428
lines changed

‎sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMAutoPatchSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsAssessmentModeOfImageDefault.json‎

Lines changed: 549 additions & 425 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMAutoPatchSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsValueOfAutomaticByOS.json‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMAutoPatchSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsValueOfManual.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMAutoPatchSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsValuesOfAutomaticByPlatform.json‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetAutomaticOSUpgradePolicies.json‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetExtensionUpgradeAPIs.json‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdk/compute/Microsoft.Azure.Management.Compute/tests/SessionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetRollingUpgradeHistory.json‎

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)