Skip to content

Commit 6ed02f5

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-encryption-ga
2 parents 6c7759c + 2a26eb6 commit 6ed02f5

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

articles/aks/use-azure-linux.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Use the Azure Linux container host on Azure Kubernetes Service (AKS)
44
description: Learn how to use the Azure Linux container host on Azure Kubernetes Service (AKS)
55
ms.topic: article
66
ms.custom: build-2023
7-
ms.date: 09/18/2023
7+
ms.date: 02/27/2024
88
---
99

1010
# Use the Azure Linux container host for Azure Kubernetes Service (AKS)
@@ -53,7 +53,7 @@ The Azure Linux container host is available for use in the same regions as AKS.
5353
To learn more about Azure Linux, see the [Azure Linux documentation][azurelinuxdocumentation].
5454

5555
<!-- LINKS - Internal -->
56-
[azurelinux-doc]: https://microsoft.github.io/CBL-Mariner/docs/#cbl-mariner-linux
56+
[azurelinux-doc]: ../azure-linux/intro-azure-linux.md
5757
[azurelinux-capabilities]: ../azure-linux/intro-azure-linux.md#azure-linux-container-host-key-benefits
5858
[azurelinux-cluster-config]: cluster-configuration.md#azure-linux-container-host-for-aks
5959
[azurelinux-node-pool]: create-node-pools.md#add-an-azure-linux-node-pool

articles/communication-services/how-tos/calling-sdk/includes/record-calls/record-calls-web.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ const isRecordingActiveChangedHandler = () => {
4040
callRecordingApi.on('isRecordingActiveChanged', isRecordingActiveChangedHandler);
4141
```
4242

43-
You can get a list of recordings by using the `recordings` property of `callRecordingApi`. It returns `RecordingInfo[]`, which has the display name of the user and the current state of the cloud recording.
43+
You can get a list of recordings by using the `recordings` property of `callRecordingApi`. It returns `RecordingInfo[]`, which has the current state of the cloud recording.
4444

4545
```js
4646
const recordings = callRecordingApi.recordings;
4747

4848
recordings.forEach(r => {
49-
console.log("User: ${r.displayName}, State: ${r.state}");
49+
console.log("State: ${r.state}");
5050
```
5151
5252
You can also subscribe to `recordingsUpdated` and get a collection of updated recordings. This event is triggered whenever there's a recording update.
@@ -55,12 +55,12 @@ You can also subscribe to `recordingsUpdated` and get a collection of updated re
5555
const cloudRecordingsUpdatedHandler = (args: { added: SDK.RecordingInfo[], removed: SDK.RecordingInfo[]}) => {
5656
console.log('Recording started by: ');
5757
args.added?.forEach(a => {
58-
console.log('User: ${a.displayName}');
58+
console.log('State: ${a.state}');
5959
});
6060

6161
console.log('Recording stopped by: ');
6262
args.removed?.forEach(r => {
63-
console.log('User: ${r.displayName}');
63+
console.log('State: ${r.state}');
6464
});
6565
};
6666
callRecordingApi.on('recordingsUpdated', cloudRecordingsUpdatedHandler );

includes/virtual-machines-managed-disks-customer-managed-keys-restrictions.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
author: roygara
55
ms.service: azure-disk-storage
66
ms.topic: include
7-
ms.date: 02/22/2023
7+
ms.date: 02/28/2024
88
ms.author: rogarana
99
ms.custom: include file
1010
---
1111
- If this feature is enabled for a disk with incremental snapshots, it can't be disabled on that disk or its snapshots.
1212
To work around this, copy all the data to an entirely different managed disk that isn't using customer-managed keys. You can do that with either the [Azure CLI](../articles/virtual-machines/linux/disks-upload-vhd-to-managed-disk-cli.md#copy-a-managed-disk) or the [Azure PowerShell module](../articles/virtual-machines/windows/disks-upload-vhd-to-managed-disk-powershell.md#copy-a-managed-disk).
1313
- Only [software and HSM RSA keys](../articles/key-vault/keys/about-keys.md) of sizes 2,048-bit, 3,072-bit and 4,096-bit are supported, no other keys or sizes.
1414
- [HSM](../articles/key-vault/keys/hsm-protected-keys.md) keys require the **premium** tier of Azure Key vaults.
15-
- For Ultra Disks and Premium SSD v2 disks only: Snapshots created from disks that are encrypted with server-side encryption and customer-managed keys must be encrypted with the same customer-managed keys.
15+
- For Ultra Disks and Premium SSD v2 disks only:
16+
- Snapshots created from disks that are encrypted with server-side encryption and customer-managed keys must be encrypted with the same customer-managed keys.
17+
- User-assigned managed identities aren't supported for Ultra Disks and Premium SSD v2 disks encrypted with customer-managed keys.
1618
- Most resources related to your customer-managed keys (disk encryption sets, VMs, disks, and snapshots) must be in the same subscription and region.
1719
- Azure Key Vaults may be used from a different subscription but must be in the same region as your disk encryption set. As a preview, you can use Azure Key Vaults from [different Microsoft Entra tenants](../articles/virtual-machines/disks-cross-tenant-customer-managed-keys.md).
1820
- Disks encrypted with customer-managed keys can only move to another resource group if the VM they are attached to is deallocated.

0 commit comments

Comments
 (0)