Skip to content

Commit 871d286

Browse files
authored
Merge pull request #103548 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 e14fbee + 37d3f8d commit 871d286

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

articles/aks/azure-nfs-volume.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Your AKS Cluster will need to live in the same or peered virtual networks as the
2323

2424
The steps for configuring with an existing VNET are described in the documentation: [creating AKS Cluster in existing VNET][aks-virtual-network] and [connecting virtual networks with VNET peering][peer-virtual-networks]
2525

26-
It also assumes you've created an Ubuntu Linux Virtual Machine (for example, 18.04 LTS). Settings and size can be to your liking and can be deployed through Azure. For Linux quickstart, see [linux VM management][linux-create].
26+
It also assumes you've created an Ubuntu Linux Virtual Machine (for example, 18.04 LTS). Settings and size can be to your liking and can be deployed through Azure. For Linux quickstart, see [Linux VM management][linux-create].
2727

2828
If you deploy your AKS Cluster first, Azure will automatically populate the virtual network field when deploying your Ubuntu machine, making them live within the same VNET. But if you want to work with peered networks instead, consult the documentation above.
2929

@@ -70,7 +70,7 @@ echo "/export localhost(rw,async,insecure,fsid=0,crossmnt,no_subtree_chec
7070

7171
nohup service nfs-kernel-server restart
7272
```
73-
The server will restart (because of the script) and you can mount the NFS Server to AKS
73+
The server will restart (because of the script) and you can mount the NFS Server to AKS.
7474

7575
>[!IMPORTANT]
7676
>Make sure to replace the **AKS_SUBNET** with the correct one from your cluster or else "*" will open your NFS Server to all ports and connections.
@@ -89,8 +89,9 @@ chmod +x ~/nfs-server-setup.sh
8989
```
9090

9191
## Connecting AKS Cluster to NFS Server
92-
We can connect the NFS Server to our cluster by provisioning a persistent volume and persistent volume claim that specifies how to access the volume.
93-
Connecting the two services in the same or peered virtual networks is necessary. Instructions for setting up the cluster in the same VNET are here: [creating AKS Cluster in existing VNET][aks-virtual-network]
92+
We can connect the NFS Server to our cluster by provisioning a persistent volume and persistent volume claim that specifies how to access the volume.
93+
94+
Connecting the two services in the same or peered virtual networks is necessary. Instructions for setting up the cluster in the same VNET are here: [Creating AKS Cluster in existing VNET][aks-virtual-network]
9495

9596
Once they are in the same virtual network (or peered), you need to provision a persistent volume and a persistent volume claim in your AKS Cluster. The containers can then mount the NFS drive to their local directory.
9697

articles/azure-cache-for-redis/cache-web-app-howto.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ The ASP.NET runtime merges the contents of the external file with the markup in
141141

142142
// Connection refers to a property that returns a ConnectionMultiplexer
143143
// as shown in the previous example.
144-
IDatabase cache = lazyConnection.GetDatabase();
144+
IDatabase cache = lazyConnection.Value.GetDatabase();
145145

146146
// Perform cache operations using the cache object...
147147

@@ -164,7 +164,7 @@ The ASP.NET runtime merges the contents of the external file with the markup in
164164
ViewBag.command5 = "CLIENT LIST";
165165
ViewBag.command5Result = cache.Execute("CLIENT", "LIST").ToString().Replace(" id=", "\rid=");
166166

167-
lazyConnection.Dispose();
167+
lazyConnection.Value.Dispose();
168168

169169
return View();
170170
}

articles/data-factory/continuous-integration-deployment.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,8 @@ Following is the current default parameterization template. If you need to add o
571571
{
572572
"Microsoft.DataFactory/factories/pipelines": {
573573
},
574+
"Microsoft.DataFactory/factories/dataflows": {
575+
},
574576
"Microsoft.DataFactory/factories/integrationRuntimes":{
575577
"properties": {
576578
"typeProperties": {
@@ -679,6 +681,8 @@ The following example shows how to add a single value to the default parameteriz
679681
{
680682
"Microsoft.DataFactory/factories/pipelines": {
681683
},
684+
"Microsoft.DataFactory/factories/dataflows": {
685+
},
682686
"Microsoft.DataFactory/factories/integrationRuntimes":{
683687
"properties": {
684688
"typeProperties": {
@@ -748,6 +752,7 @@ The following example shows how to add a single value to the default parameteriz
748752
"database": "=",
749753
"serviceEndpoint": "=",
750754
"batchUri": "=",
755+
"poolName": "=",
751756
"databaseName": "=",
752757
"systemNumber": "=",
753758
"server": "=",

articles/load-balancer/load-balancer-custom-probe-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Basic public Load Balancer exposes health probe status summarized per backend po
247247
## Limitations
248248

249249
- HTTPS probes do not support mutual authentication with a client certificate.
250-
- You should assumehHealth probes will fail when TCP timestamps are enabled.
250+
- You should assume Health probes will fail when TCP timestamps are enabled.
251251

252252
## Next steps
253253

articles/virtual-network/virtual-network-manage-subnet.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ The account you log into, or connect to Azure with, must be assigned to the [net
4444
- **Network security group**: You can associate zero, or one existing network security group to a subnet to filter inbound and outbound network traffic for the subnet. The network security group must exist in the same subscription and location as the virtual network. Learn more about [network security groups](security-overview.md) and [how to create a network security group](tutorial-filter-network-traffic.md).
4545
- **Route table**: You can associate zero or one existing route table to a subnet to control network traffic routing to other networks. The route table must exist in the same subscription and location as the virtual network. Learn more about [Azure routing](virtual-networks-udr-overview.md) and [how to create a route table](tutorial-create-route-table-portal.md)
4646
- **Service endpoints:** A subnet can have zero or multiple service endpoints enabled for it. To enable a service endpoint for a service, select the service or services that you want to enable service endpoints for from the **Services** list. The location is configured automatically for an endpoint. By default, service endpoints are configured for the virtual network's region. For Azure Storage, to support regional failover scenarios, endpoints are automatically configured to [Azure paired regions](../best-practices-availability-paired-regions.md?toc=%2fazure%2fvirtual-network%2ftoc.json#what-are-paired-regions).
47-
- **Subnet delegation:** A subnet can have zero to multiple delegations enabled for it. Subnet delegation gives explicit permissions to the service to create service-specific resources in the subnet using a unique identifier when deploying the service. To delegate for a service, select the service you want to delegate to from the **Services** list.
48-
47+
4948
To remove a service endpoint, unselect the service you want to remove the service endpoint for. To learn more about service endpoints, and the services they can be enabled for, see [Virtual network service endpoints overview](virtual-network-service-endpoints-overview.md). Once you enable a service endpoint for a service, you must also enable network access for the subnet for a resource created with the service. For example, if you enable the service endpoint for *Microsoft.Storage*, you must also enable network access to all Azure Storage accounts you want to grant network access to. For details about how to enable network access to subnets that a service endpoint is enabled for, see the documentation for the individual service you enabled the service endpoint for.
5049

5150
To validate that a service endpoint is enabled for a subnet, view the [effective routes](diagnose-network-routing-problem.md) for any network interface in the subnet. When an endpoint is configured, you see a *default* route with the address prefixes of the service, and a nextHopType of **VirtualNetworkServiceEndpoint**. To learn more about routing, see [Routing overview](virtual-networks-udr-overview.md).
51+
- **Subnet delegation:** A subnet can have zero to multiple delegations enabled for it. Subnet delegation gives explicit permissions to the service to create service-specific resources in the subnet using a unique identifier when deploying the service. To delegate for a service, select the service you want to delegate to from the **Services** list.
52+
5253
6. To add the subnet to the virtual network that you selected, select **OK**.
5354

5455
**Commands**

0 commit comments

Comments
 (0)