Skip to content

Commit 760419b

Browse files
authored
Sync release-hotfixes with main
Sync release-hotfixes with main
2 parents f1ebb5f + 0ff2c6a commit 760419b

31 files changed

+128
-1623
lines changed

.openpublishing.redirection.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path":"azure-stack/hci/manage/bitlocker-on-csv.md",
5+
"redirect_url":"/azure-stack/hci/manage/manage-bitlocker",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path":"azure-stack/hci/manage/install-preview-version.md",
10+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path":"azure-stack/hci/manage/network-atc-faq.md",
15+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path":"azure-stack/hci/manage/preview-post-installation.md",
20+
"redirect_url":"/azure-stack/hci/whats-new?tabs=2405releases",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path":"azure-stack/hci/manage/preview-channel.md",
525
"redirect_url":"/azure-stack/hci/deploy/download-azure-stack-hci-23h2-software",
@@ -145,6 +165,16 @@
145165
"redirect_url":"/azure/active-directory/develop/howto-create-service-principal-portal",
146166
"redirect_document_id":false
147167
},
168+
{
169+
"source_path":"azure-stack/operator/azure-stack-provision-storage-account.md",
170+
"redirect_url":"/azure-stack/operator/azure-stack-manage-storage-accounts",
171+
"redirect_document_id":false
172+
},
173+
{
174+
"source_path":"azure-stack/user/azure-stack-connect-azure-stack.md",
175+
"redirect_url":"/azure-stack/user/azure-stack-powershell-configure-user",
176+
"redirect_document_id":false
177+
},
148178
{
149179
"source_path":"azure-stack/operator/app-service-known-issues-v0.md",
150180
"redirect_url":"/azure-stack/operator/app-service-release-notes-2021-q1#known-issues-update",
@@ -185,6 +215,21 @@
185215
"redirect_url":"/azure-stack/operator/app-service-release-notes-2302",
186216
"redirect_document_id":false
187217
},
218+
{
219+
"source_path":"azure-stack/operator/azure-stack-app-service-release-notes-update-three.md",
220+
"redirect_url":"/azure-stack/operator/app-service-release-notes-2302",
221+
"redirect_document_id":false
222+
},
223+
{
224+
"source_path":"azure-stack/operator/app-service-release-notes-2020-Q2.md",
225+
"redirect_url":"/azure-stack/operator/app-service-release-notes-2302",
226+
"redirect_document_id":false
227+
},
228+
{
229+
"source_path":"azure-stack/operator/app-service-release-notes-2020-Q3.md",
230+
"redirect_url":"/azure-stack/operator/app-service-release-notes-2302",
231+
"redirect_document_id":false
232+
},
188233
{
189234
"source_path":"azure-stack/operator/azure-stack-sql-resource-provider-11300.md",
190235
"redirect_url":"/azure-stack/operator/azure-stack-mysql-resource-provider-2-0-13",

azure-stack/hci/azure-stack-hci-oem-license.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ For more information on the Azure Stack HCI OEM license, see [Azure Stack HCI OE
6969

7070
## Licensing Windows Server guest VMs on Azure Stack HCI
7171

72-
You can activate Windows Server VMs on an Azure Stack HCI cluster using generic Automatic Virtual Machine Activation (AVMA) client keys. This can be done through either Windows Admin Center or PowerShell. For more information on using AVMA to activate Windows Server VMs, see [Activate Windows Server VMs using Automatic Virtual Machine Activation](../hci/manage/vm-activate.md#activate-bring-your-own-license-byol-through-avma).
72+
You can activate Windows Server VMs on an Azure Stack HCI cluster using generic Automatic Virtual Machine Activation (AVMA) client keys. This can be done through either Windows Admin Center or PowerShell. For more information on using AVMA to activate Windows Server VMs, see [Activate Windows Server VMs using Automatic Virtual Machine Activation](manage/vm-activate.md#activate-azure-hybrid-benefit-ahb-through-avma).
7373

7474
## Licensing AKS on Azure Stack HCI
7575

azure-stack/hci/concepts/physical-network-requirements.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,15 @@ If your switch isn't included, contact your switch vendor to ensure that your sw
229229
|Model |Firmware| Management | Storage | Compute (Standard)| Compute (SDN)|
230230
|----- |---| :-: | :-: | :-: | :-: |
231231
| [SSE-C4632](https://www.supermicro.com/datasheet/datasheet_SSE-C4632.pdf) <br>(10, 25, 100 GbE)|Broadcom Advanced Enterprise SONiC OS 4.2.1 or later |&check;| &check;| &check;| &check; |
232+
| [SSE-T8032](https://www.supermicro.com/datasheet/datasheet_SSE-T8032S.pdf) <br>(10, 25, 100, 400 GbE)|Broadcom Advanced Enterprise SONiC OS 4.2.1 or later |&check;| &check;| &check;| &check; |
232233
> [!NOTE]
233234
> Guest RDMA requires both Compute (Standard) and Storage.
234235
### 22H2
235236

236237
|Model |Firmware| Management | Storage | Compute (Standard)| Compute (SDN)|
237238
|----- |---| :-: | :-: | :-: | :-: |
238239
| [SSE-C4632](https://www.supermicro.com/datasheet/datasheet_SSE-C4632.pdf) <br>(10, 25, 100 GbE)|Broadcom Advanced Enterprise SONiC OS 4.2.1 or later |&check;| &check;| &check;| &check; |
240+
| [SSE-T8032](https://www.supermicro.com/datasheet/datasheet_SSE-T8032S.pdf) <br>(10, 25, 100, 400 GbE)|Broadcom Advanced Enterprise SONiC OS 4.2.1 or later |&check;| &check;| &check;| &check; |
239241
> [!NOTE]
240242
> Guest RDMA requires both Compute (Standard) and Storage.
241243

0 commit comments

Comments
 (0)