Skip to content

Commit 2f44b91

Browse files
authored
Merge pull request #78739 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents d88ec59 + 998b3d0 commit 2f44b91

File tree

7 files changed

+10
-5
lines changed

7 files changed

+10
-5
lines changed

articles/aks/upgrade-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To confirm that the upgrade was successful, use the [az aks show][az-aks-show] c
5959
az aks show --resource-group myResourceGroup --name myAKSCluster --output table
6060
```
6161

62-
The following example output shows that the cluster now runs *1.11.6*:
62+
The following example output shows that the cluster now runs *1.12.8*:
6363

6464
```json
6565
Name Location ResourceGroup KubernetesVersion ProvisioningState Fqdn

articles/azure-functions/functions-dotnet-dependency-injection.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ namespace MyNamespace
6464
private readonly IMyService _service;
6565
private readonly HttpClient _client;
6666

67-
public HttpTrigger(IMyService service, HttpClient client)
67+
public HttpTrigger(IMyService service, IHttpClientFactory httpClientFactory)
6868
{
6969
_service = service;
70-
_client = client;
70+
_client = httpClientFactory.CreateClient();;
7171
}
7272

7373
[FunctionName("GetPosts")]

articles/dns/dns-alias.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ For example, if your static website is named www.contoso.com, your users can acc
6363

6464
As described previously, CNAME records are not supported at the zone apex. So, you can’t use a CNAME record to point contoso.com to your CDN endpoint. Instead, you can use an alias record to point the zone apex to a CDN endpoint directly.
6565

66+
> [!NOTE]
67+
> Pointing a zone apex to CDN endpoints for Azure CDN from Akamai is currently not supported.
68+
6669
## Next steps
6770

6871
To learn more about alias records, see the following articles:

articles/hdinsight/hdinsight-migrate-granular-access-cluster-configurations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ If you are using version 3.20.0 or below, update to the [latest version of the A
8585

8686
### Azure Data Lake and Stream Analytics Tools for Visual Studio
8787

88-
Update to version 2.3.9000.1 or later of [Azure Data Lake and Stream Analytics Tools for Visual Studio](https://marketplace.visualstudio.com/items?itemName=ADLTools.AzureDataLakeandStreamAnalyticsTools&ssr=false#overview) to avoid interruptions. For help with updating, see our documentation, [Update Data Lake Tools for Visual Studio](https://docs.microsoft.com/en-us/azure/hdinsight/hadoop/apache-hadoop-visual-studio-tools-get-started#update-data-lake-tools-for-visual-studio).
88+
Update to version 2.3.9000.1 or later of [Azure Data Lake and Stream Analytics Tools for Visual Studio](https://marketplace.visualstudio.com/items?itemName=ADLTools.AzureDataLakeandStreamAnalyticsTools&ssr=false#overview) to avoid interruptions. For help with updating, see our documentation, [Update Data Lake Tools for Visual Studio](https://docs.microsoft.com/azure/hdinsight/hadoop/apache-hadoop-visual-studio-tools-get-started#update-data-lake-tools-for-visual-studio).
8989

9090
### Azure Toolkit for Eclipse
9191

articles/sql-database/sql-database-sync-data.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ Provisioning and deprovisioning during sync group creation, update, and deletion
123123
- The names of objects (databases, tables, and columns) cannot contain the printable characters period (.), left square bracket ([), or right square bracket (]).
124124
- Azure Active Directory authentication is not supported.
125125
- Tables with same name but different schema (for example, dbo.customers and sales.customers) are not supported.
126+
- Columns with User Defined Data Types are not supported
126127

127128
#### Unsupported data types
128129

articles/terraform/terraform-backend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Now, initialize the configuration with *Terraform init* and then run the configu
9797

9898
When using an Azure Storage Blob for state storage, the blob is automatically locked before any operation that writes state. This configuration prevents multiple concurrent state operations, which can cause corruption. For more information, see [State Locking][terraform-state-lock] on the Terraform documentation.
9999

100-
The lock can be seen when examining the blob though the Azure portal or other Azure management tooling.
100+
The lock can be seen when examining the blob through the Azure portal or other Azure management tooling.
101101

102102
![Azure blob with lock](media/terraform-backend/lock.png)
103103

articles/virtual-wan/virtual-wan-expressroute-portal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Before you can configure Virtual WAN, you must first enroll your subscription in
4343
**Preview Considerations:**
4444

4545
The ExpressRoute circuit must be enabled in a country/region that supports [ExpressRoute Global Reach](https://docs.microsoft.com/azure/expressroute/expressroute-faqs#where-is-expressroute-global-reach-supported).
46+
The ExpressRoute circuit must be a Premium Circuit to connect to Virtual WAN hub.
4647

4748
## <a name="vnet"></a>1. Create a virtual network
4849

0 commit comments

Comments
 (0)