Skip to content

Commit d2c2b41

Browse files
authored
Merge pull request #237906 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents bec901d + cf340a5 commit d2c2b41

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

articles/aks/cluster-autoscaler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ You can also configure more granular details of the cluster autoscaler by changi
162162
> [!IMPORTANT]
163163
> When using the autoscaler profile, keep the following information in mind:
164164
>
165-
> * The cluster autoscaler profile affects **all node pools** that use the cluster autoscaler. You can't set an autoscaler profile per node pool. When you est the profile, any existing node pools with the cluster autoscaler enabled immediately start using the profile.
165+
> * The cluster autoscaler profile affects **all node pools** that use the cluster autoscaler. You can't set an autoscaler profile per node pool. When you set the profile, any existing node pools with the cluster autoscaler enabled immediately start using the profile.
166166
> * The cluster autoscaler profile requires version *2.11.1* or greater of the Azure CLI. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
167167
168168
### Set the cluster autoscaler profile on a new cluster

articles/azure-maps/data-driven-style-expressions-web-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 4/4/2019
77
ms.topic: conceptual
88
ms.service: azure-maps
99
services: azure-maps
10-
ms.custom: codepen, devx-track-js
10+
ms.custom: devx-track-js
1111
---
1212

1313
# Data-driven Style Expressions (Web SDK)

articles/azure-vmware/upgrade-hcx-azure-vmware-solutions.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ You can update HCX Connector and HCX Cloud systems during separate maintenance w
1919
- For systems requirements, compatibility, and upgrade prerequisites, see the [VMware HCX release notes](https://docs.vmware.com/en/VMware-HCX/index.html).
2020

2121
- For more information about the upgrade path, see the [Product Interoperability Matrix](https://interopmatrix.vmware.com/Upgrade?productId=660).
22+
- For information regarding VMware product compatibility by version, see the [Compatibility Matrix](https://interopmatrix.vmware.com/Interoperability?col=660,&row=0,).
23+
- Review VMware Software Versioning, Skew and Legacy Support Policies [here](https://docs.vmware.com/en/VMware-HCX/4.5/hcx-skew-policy/GUID-787FB2A1-52AF-483C-B595-CF382E728674.html).
2224

2325
- Ensure HCX manager and site pair configurations are healthy.
2426

@@ -96,4 +98,4 @@ See [Rolling Back an Upgrade Using Snapshots](https://docs.vmware.com/en/VMware-
9698
## Next steps
9799
[Software Versioning, Skew and Legacy Support Policies](https://docs.vmware.com/en/VMware-HCX/4.5/hcx-skew-policy/GUID-787FB2A1-52AF-483C-B595-CF382E728674.html)
98100

99-
[Updating VMware HCX](https://docs.vmware.com/en/VMware-HCX/4.5/hcx-user-guide/GUID-508A94B2-19F6-47C7-9C0D-2C89A00316B9.html)
101+
[Updating VMware HCX](https://docs.vmware.com/en/VMware-HCX/4.5/hcx-user-guide/GUID-508A94B2-19F6-47C7-9C0D-2C89A00316B9.html)

articles/frontdoor/end-to-end-tls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For the Azure Front Door managed certificate option, the certificates are manage
9595

9696
For your own custom TLS/SSL certificate:
9797

98-
1. You set the secret version to 'Latest' for the certificate to be automatically rotated to the latest version when a newer version of the certificate is available in your key vault. For custom certificates, the certificate gets auto-rotated within 1-2 days with a newer version of certificate, no matter what the certificate expired time is.
98+
1. You set the secret version to 'Latest' for the certificate to be automatically rotated to the latest version when a newer version of the certificate is available in your key vault. For custom certificates, the certificate gets auto-rotated within 3-4 days with a newer version of certificate, no matter what the certificate expired time is.
9999

100100
1. If a specific version is selected, autorotation isn’t supported. You've will have to reselect the new version manually to rotate certificate. It takes up to 24 hours for the new version of the certificate/secret to be deployed.
101101

includes/functions-cosmosdb-extension-java-note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ ms.topic: include
55
ms.date: 02/01/2022
66
ms.author: glenga
77
---
8-
Because of schema changes in the Azure Cosmos DB SDK, version 4.x of the Azure Cosmos DB extension isn't currently supported for Java functions.
8+
Because of schema changes in the Azure Cosmos DB SDK, version 4.x of the Azure Cosmos DB extension requires [azure-functions-java-library V3.0.0](https://central.sonatype.com/artifact/com.microsoft.azure.functions/azure-functions-java-library/3.0.0) for Java functions.

0 commit comments

Comments
 (0)