Skip to content

Commit a8a548d

Browse files
authored
Merge pull request #90393 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 b8e67bc + 48a2476 commit a8a548d

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

articles/active-directory/hybrid/how-to-connect-sync-feature-prevent-accidental-deletes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ If this was unexpected, then investigate and take corrective actions. To see whi
5656

5757
[!NOTE] If you aren't sure all deletes are desired, and wish to go down a safer route. You can use the PowerShell cmdlet : `Enable-ADSyncExportDeletionThreshold` to set a new threshold rather than disabling the threshold which could allow undesired deletions.
5858

59+
## If all deletes are desired
5960
If all the deletes are desired, then do the following:
6061

6162
1. To retrieve the current deletion threshold, run the PowerShell cmdlet `Get-ADSyncExportDeletionThreshold`. Provide an Azure AD Global Administrator account and password. The default value is 500.

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.devlang: na
1212
ms.topic: reference
1313
ms.tgt_pltfrm: na
1414
ms.workload: identity
15-
ms.date: 09/23/2019
15+
ms.date: 10/2/2019
1616
ms.subservice: hybrid
1717
ms.author: billmath
1818

@@ -38,6 +38,17 @@ Download| [Download Azure AD Connect](https://go.microsoft.com/fwlink/?LinkId=61
3838
While we go through this process, the version number of the release will be shown with an "X" in the minor release number position, as in "1.3.X.0" - this indicates that the release notes in this document are valid for all versions beginning with "1.3.". As soon as we have finalized the release process the release version number will be updated to the most recently released version and the release status will be updated to "Released for download and auto upgrade".
3939
Not all releases of Azure AD Connect will be made available for auto upgrade. The release status will indicate whether a release is made available for auto upgrade or for download only. If auto upgrade was enabled on your Azure AD Connect server then that server will automatically upgrade to the latest version of Azure AD Connect that is released for auto upgrade. Note that not all Azure AD Connect configurations are eligible for auto upgrade. Please follow this link to read more about [auto upgrade](https://docs.microsoft.com/azure/active-directory/hybrid/how-to-connect-install-automatic-upgrade)
4040

41+
## 1.4.25.0
42+
43+
### Release status
44+
9/28/2019: Released for auto-upgrade to select tenants. Not available for download.
45+
46+
This version fixes a bug where some servers that were auto-upgraded from a previous version to 1.4.18.0 and experienced issues with Self-service password reset (SSPR) and Password Writeback.
47+
48+
### Fixed issues
49+
50+
Under certain circumstances, servers that were auto upgraded to version 1.4.18.0 did not re-enable Self-service password reset and Password Writeback after the upgrade was completed. This auto upgrade release fixes that issue and re-enables Self-service password reset and Password Writeback.
51+
4152
## 1.4.18.0
4253

4354
>[!IMPORTANT]

articles/container-registry/container-registry-auth-aks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ When you're using Azure Container Registry (ACR) with Azure Kubernetes Service (
1717

1818
You only need to configure one of these authentication methods. The most common approach is to [grant access using the AKS service principal](#grant-aks-access-to-acr). If you have specific needs, you can optionally [grant access using Kubernetes secrets](#access-with-kubernetes-secret).
1919

20-
This article assumes that you've already created an AKS cluster and you are able to access the cluster with the `kubectl` command-line client. If instead you want to create a cluster and configure access to a container registry at cluster creation time, see [Tutorial: Deploy an AKS cluster](../aks/tutorial-kubernetes-deploy-cluster.md) or [Authenticate with Azure Container Registry from Azure Kubernetes Service (preview)](../aks/cluster-container-registry-integration.md).
20+
This article assumes that you've already created an AKS cluster and you are able to access the cluster with the `kubectl` command-line client. If instead you want to create a cluster and configure access to a container registry at cluster creation time, see [Tutorial: Deploy an AKS cluster](../aks/tutorial-kubernetes-deploy-cluster.md) or [Authenticate with Azure Container Registry from Azure Kubernetes Service](../aks/cluster-container-registry-integration.md).
2121

2222
## Grant AKS access to ACR
2323

articles/virtual-machines/linux/tutorial-build-deploy-jenkins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ to a [deployment group](https://docs.microsoft.com/azure/devops/pipelines/releas
5353
## Get the sample app
5454

5555
You need an app to deploy, stored in a Git repository.
56-
For this tutorial, we recommend that you use [this sample app available from GitHub](https://github.com/azooinmyluggage/fabrikam-node). This tutorial contains a sample script that's used for installing Node.js and an application. If you want to work with your own repository, you should configure a similar sample.
56+
For this tutorial, we recommend that you use [this sample app available from GitHub](https://github.com/azure-devops/fabrikam-node). This tutorial contains a sample script that's used for installing Node.js and an application. If you want to work with your own repository, you should configure a similar sample.
5757

5858
Create a fork of this app and take note of the location (URL) for use in later steps of this tutorial. For more information, see [Fork a repo](https://help.github.com/articles/fork-a-repo/).
5959

0 commit comments

Comments
 (0)