Skip to content

Commit 6db83f3

Browse files
authored
Merge pull request #97968 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 39c3563 + da6a1f8 commit 6db83f3

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

articles/active-directory/hybrid/how-to-connect-pta-quick-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Second, you can create and run an unattended deployment script. This is useful w
140140
$User = "<username>"
141141
$PlainPassword = '<password>'
142142
$SecurePassword = $PlainPassword | ConvertTo-SecureString -AsPlainText -Force
143-
$cred = New-Object TypeName System.Management.Automation.PSCredential ArgumentList $User, $SecurePassword
143+
$cred = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $User, $SecurePassword
144144
3. Go to **C:\Program Files\Microsoft Azure AD Connect Authentication Agent** and run the following script using the `$cred` object that you created:
145145

146146
RegisterConnector.ps1 -modulePath "C:\Program Files\Microsoft Azure AD Connect Authentication Agent\Modules\" -moduleName "AppProxyPSModule" -Authenticationmode Credentials -Usercredentials $cred -Feature PassthroughAuthentication

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Under certain circumstances, servers that were auto upgraded to version 1.4.18.0
6565
6666

6767
### Release status
68-
9/25/2019: Removed from manual download until incident investigation is complete.
68+
9/25/2019: Released for auto-upgrade only.
6969

7070
### New features and improvements
7171
- New troubleshooting tooling helps troubleshoot "user not syncing", "group not syncing" or "group member not syncing" scenarios.

articles/aks/operator-best-practices-multi-region.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ms.service: container-service
88
ms.topic: conceptual
99
ms.date: 11/28/2018
1010
ms.author: thfalgou
11+
ms.custom: fasttrack-edit
1112
#Customer intent: As an AKS cluster operator, I want to plan for business continuity or disaster recovery to help protect my cluster from region problems.
1213
---
1314
# Best practices for business continuity and disaster recovery in Azure Kubernetes Service (AKS)
@@ -58,6 +59,12 @@ For information on how to set up endpoints and routing, see [Configure the geogr
5859

5960
Traffic Manager uses DNS (layer 3) to shape traffic. [Azure Front Door Service](https://docs.microsoft.com/azure/frontdoor/front-door-overview) provides an HTTP/HTTPS (layer 7) routing option. Additional features of Azure Front Door Service include SSL termination, custom domain, web application firewall, URL Rewrite, and session affinity. Review the needs of your application traffic to understand which solution is the most suitable.
6061

62+
### Interconnect regions with global virtual network peering
63+
64+
If the clusters need to talk to each other, connecting both virtual networks to each other can be achieved through [virtual network peering](https://docs.microsoft.com/azure/virtual-network/virtual-network-peering-overview). This technology interconnects virtual networks to each other providing high bandwidth across Microsoft's backbone network, even across different geographic regions.
65+
66+
A prerequisite to peer the virtual networks where AKS clusters are running is to use the standard Load Balancer in your AKS cluster, so that kubernetes services are reachable across the virtual network peering.
67+
6168
## Enable geo-replication for container images
6269

6370
**Best practice**: Store your container images in Azure Container Registry and geo-replicate the registry to each AKS region.

articles/managed-applications/update-managed-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.author: tomfitz
1717

1818
This article describes how to update resources that are deployed as part of a managed application. As the publisher of a managed application, you have access to the resources in the managed resource group. To update these resources, you need to find the managed resource group associated with a managed application, and access the resource in that resource group.
1919

20-
This article assumes you have deployed the managed application in the [Managed Web Application (IaaS) with Azure management services](https://github.com/Azure/azure-managedapp-samples/tree/master/samples/201-managed-web-app) sample project. That managed application includes a **Standard_D1_v2** virtual machine. If you have not deployed that managed application, you can still use this article to become familiar with the steps for updating a managed resource group.
20+
This article assumes you have deployed the managed application in the [Managed Web Application (IaaS) with Azure management services](https://github.com/Azure/azure-managedapp-samples/tree/master/Managed%20Application%20Sample%20Packages/201-managed-web-app) sample project. That managed application includes a **Standard_D1_v2** virtual machine. If you have not deployed that managed application, you can still use this article to become familiar with the steps for updating a managed resource group.
2121

2222
The following image shows the deployed managed application.
2323

articles/storage/blobs/data-lake-storage-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ This table shows a list of the third-party services and products that were modif
135135
| Analytics framework | Cloudera  | CDH | [Link](https://www.cloudera.com/documentation/enterprise/5-11-x/topics/admin_adls_config.html) | *Not yet available* | [Link](https://www.cloudera.com/documentation/enterprise/latest/topics/admin_adls2_config.html) |
136136
| | Cloudera | Altus | [Link](https://www.cloudera.com/more/news-and-blogs/press-releases/2017-09-27-cloudera-introduces-altus-data-engineering-microsoft-azure-hybrid-multi-cloud-data-analytic-workflows.html) | *Not supported* | *Not yet available* |
137137
| | HortonWorks  | HDP 3.0 | [Link](https://docs.hortonworks.com/HDPDocuments/HDP2/HDP-2.6.3/bk_cloud-data-access/content/adls-get-started.html)  | *Not yet available* | *Not yet available* |
138-
| | Qubole  | | [Link](https://www.qubole.com/blog/big-data-analytics-microsoft-azure-data-lake-store-qubole/) | *Not yet available* | *Not yet available* |
138+
| | Qubole  | | [Link](https://www.qubole.com/blog/big-data-analytics-microsoft-azure-data-lake-store-qubole/) | [Link](https://docs.qubole.com/en/latest/quick-start-guide/Azure-quick-start-guide/QuboleConnect/detailed-azure-qubole-steps/azure-Azure-setup.html#step-4c-configure-azure-data-lake-gen-2-storage-with-keys) | [Link](https://docs.qubole.com/en/latest/quick-start-guide/Azure-quick-start-guide/QuboleConnect/detailed-azure-qubole-steps/azure-Azure-setup.html#step-4d-configure-azure-data-lake-gen-2-storage-with-tokens) |
139139
| ETL  | StreamSets  | | [Link](https://streamsets.com/blog/ingest-data-azure) | *Not yet available* | *Not yet available* |
140140
| | Informatica  | | [Link](https://kb.informatica.com/proddocs/Product%20Documentation/6/IC_Spring2017_MicrosoftAzureDataLakeStoreV2ConnectorGuide_en.pdf) | *Not yet available* | *Not yet available* |
141141
| | Attunity  | | [Link](https://www.attunity.com/company/press-releases/microsoft-and-attunity-announce-strategic-partnership-for-data-migration/) | *Not yet available* | *Not yet available* |

articles/vpn-gateway/vpn-gateway-about-vpngateways.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Use the diagrams and descriptions to help select the connection topology to matc
7373

7474
### <a name="S2S"></a>Site-to-Site
7575

76-
A Site-to-Site (S2S) VPN gateway connection is a connection over IPsec/IKE (IKEv1 or IKEv2) VPN tunnel. S2S connections can be used for cross-premises and hybrid configurations. A S2S connection requires a VPN device located on-premises that has a public IP address assigned to it and is not located behind a NAT. For information about selecting a VPN device, see the [VPN Gateway FAQ - VPN devices](vpn-gateway-vpn-faq.md#s2s).
76+
A Site-to-Site (S2S) VPN gateway connection is a connection over IPsec/IKE (IKEv1 or IKEv2) VPN tunnel. S2S connections can be used for cross-premises and hybrid configurations. A S2S connection requires a VPN device located on-premises that has a public IP address assigned to it. For information about selecting a VPN device, see the [VPN Gateway FAQ - VPN devices](vpn-gateway-vpn-faq.md#s2s).
7777

7878
![Azure VPN Gateway Site-to-Site connection example](./media/vpn-gateway-about-vpngateways/vpngateway-site-to-site-connection-diagram.png)
7979

0 commit comments

Comments
 (0)