Skip to content

Commit 5b241b3

Browse files
committed
Resolve merge conflict.
1 parent d1c401b commit 5b241b3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

azure-local/upgrade/about-upgrades-23h2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Azure Local upgrade supports the following services and workloads:
7171
| Workload/Configuration | Currently supported |
7272
|--|--|
7373
| Azure Kubernetes (AKS) on Azure Local | See notes <br> Kubernetes versions are incompatible between the *old* and *new* Azure Local versions. <br> Remove AKS and all the settings from AKS enabled by Azure Arc before you apply the solution upgrade. |
74-
| Azure Local VMs | See notes <br> Preview versions of Azure Local VMs can't be upgraded. |
74+
| Arc VMs on Azure Local | See notes <br> Preview versions of Arc VMs can't be upgraded. |
7575
| Stretched clusters on Azure Local | Yes <br> You must upgrade to Azure Stack HCI OS, version 23H2 to maintain your cluster in a supported state. <br> The solution upgrade isn't applicable for stretched clusters. |
7676
| System Center Virtual Machine Manager (SCVMM) | Yes <br> If your Azure Local instance running version 22H2 is managed by SCVMM 2025, the OS upgrade is supported. |
7777
| Azure Local, version 22H2SP | No <br> This upgrade process isn't supported for upgrading from Azure Local, version 22H2 Supplemental Package clusters. |

0 commit comments

Comments
 (0)