Skip to content

Commit 369a109

Browse files
Merge pull request #3427 from MicrosoftDocs/main638695548744448580sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents e08bbd9 + 2ceea62 commit 369a109

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

azure-local/concepts/stretched-clusters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Stretched clusters overview
33
description: Learn about stretched clusters
44
author: jasongerend
55
ms.topic: how-to
6-
ms.date: 07/29/2024
6+
ms.date: 12/10/2024
77
ms.author: jgerend
88
ms.reviewer: johnmar
99
---
@@ -15,7 +15,7 @@ ms.reviewer: johnmar
1515
[!INCLUDE [azure-local-banner-22h2](../includes/azure-local-banner-22h2.md)]
1616

1717
> [!IMPORTANT]
18-
> Stretched clusters are not yet supported in Azure Stack HCI version 23H2.
18+
> Stretched clusters are not supported in Azure Local, version 23H2.
1919
2020
An Azure Stack HCI stretched cluster solution for disaster recovery provides automatic failover to restore production quickly and without the need for manual intervention. Storage Replica provides the replication of volumes across sites for disaster recovery, with all servers staying in sync.
2121

azure-local/manage/virtual-machine-image-azure-marketplace.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ Follow these steps to create a VM image using the Azure CLI.
101101
| Windows 11 Enterprise multi-session + Microsoft 365 | microsoftwindowsdesktop | office-365 | win11-23h2-avd-m365 |
102102
| Windows 10 Enterprise multi-session + Microsoft 365 | microsoftwindowsdesktop | office-365 | win10-21h2-avd-m365<br>win10-22h2-avd-m365 |
103103
| Windows 11 Pro | microsoftwindowsdesktop | windows-11 | win11-23h2-pro |
104-
| Windows 11 Enterprise | microsoftwindowsdesktop | windows-11 | win11-22h2-ent<br>win11-23h2-ent |
104+
| Windows 11 Enterprise | microsoftwindowsdesktop | windows-11 | win11-22h2-ent<br>win11-23h2-ent<br>win11-24h2-ent |
105105
| Windows 11 Enterprise multi-session | microsoftwindowsdesktop | windows-11 | win11-22h2-avd<br>win11-23h2-avd<br>win11-24h2-avd |
106106
| Windows 10 Pro | microsoftwindowsdesktop | windows-10 | win10-22h2-pro-g2 |
107107
| Windows 10 Enterprise | microsoftwindowsdesktop | windows-10 | win10-22h2-ent-g2 |
108108
| Windows 10 Enterprise multi-session | microsoftwindowsdesktop | windows-10 | win10-22h2-avd |
109-
| Windows Server 2025 Datacenter: Azure Edition | microsoftwindowsserver | windowsserver | 2025-datacenter-azure-edition-smalldisk<br>2025-datacenter-azure-edition-core<br>2025-datacenter-azure-edition |
109+
| Windows Server 2025 Datacenter: Azure Edition | microsoftwindowsserver | windowsserver | 2025-datacenter-azure-edition-smalldisk<br>2025-datacenter-azure-edition-core<br>2025-datacenter-azure-edition |
110110
| Windows Server 2022 Datacenter: Azure Edition | microsoftwindowsserver | windowsserver | 2022-datacenter-azure-edition-hotpatch<br>2022-datacenter-azure-edition-core<br>2022-datacenter-azure-edition |
111111
| Windows Server 2019 | microsoftwindowsserver | windowsserver | 2019-datacenter-gensecond<br>2019-datacenter-core-g2 |
112112
| SQL Server 2022 Enterprise on Windows Server 2022 | microsoftsqlserver | sql2022-ws2022 | enterprise-gen2<br>standard-gen2 |

azure-local/migrate/migrate-faq.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
author: alkohli
77
ms.author: alkohli
88
ms.service: azure-stack-hci
9-
ms.date: 10/31/2024
9+
ms.date: 12/10/2024
1010

1111
title: FAQ - Migration of Hyper-V and VMware VMs to Azure Local using Azure Migrate (preview)
1212

@@ -100,10 +100,14 @@ sections:
100100
101101
First, ensure that the target Azure Local that hosts the migrated VMs is updated to 2405.1. This version contains a fix for guest enablement of migrated VMs. Then, follow the instructions in [Enable Guest Management on Arc VMs](migrate-enable-guest-management.md).
102102
103-
### Can I use the same Azure Migrate Project for both Hyper-V and VMware migrations?
103+
### Can I use the same Azure Migrate project for both Hyper-V and VMware migrations?
104104
105105
No, this is not a supported scenario with this release. Create a separate project for each source from which you wish to migrate.
106106
107+
### Can I use private endpoints to connect to my Azure Migrate project?
108+
109+
No, this is not a supported scenario with this release.
110+
107111
## [VMware VMs only](#tab/vmware-vms)
108112
109113
### How many VMs can I replicate in parallel from VMware?

0 commit comments

Comments
 (0)