Skip to content

Commit ba115d3

Browse files
authored
Merge pull request #202165 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents e5cf201 + 2d57804 commit ba115d3

File tree

4 files changed

+95
-5
lines changed

4 files changed

+95
-5
lines changed

articles/active-directory/hybrid/reference-connect-adsynctools.md

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1358,6 +1358,7 @@ Accept wildcard characters: False
13581358
```
13591359
#### CommonParameters
13601360
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
1361+
13611362
## Set-ADSyncToolsTls12
13621363
### SYNOPSIS
13631364
Sets Client\Server TLS 1.2 settings for .NET Framework
@@ -1745,4 +1746,95 @@ Accept pipeline input: False
17451746
Accept wildcard characters: False
17461747
```
17471748
#### CommonParameters
1748-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
1749+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
1750+
1751+
## Get-ADSyncToolsDuplicateUsersSourceAnchor
1752+
### SYNOPSIS
1753+
Gets a list of all the objects with "Source anchor has changed" error.
1754+
### SYNTAX
1755+
```
1756+
Get-ADSyncToolsDuplicateUsersSourceAnchor [-ADConnectorName] <Object> [<CommonParameters>]
1757+
```
1758+
### DESCRIPTION
1759+
There are certain scenarios like M&A where Customers add a new forest to Azure AD Connect with duplicate user objects.
1760+
This causes multiple sync errors if the new connector precedence is higher for the newly joined users. This cmdlet will provide a list of all the objects with "Source anchor has changed" errors.
1761+
1762+
### EXAMPLES
1763+
#### EXAMPLE 1
1764+
```
1765+
Get-ADSyncToolsDuplicateUsersSourceAnchor -ADConnectorName Contoso.com
1766+
```
1767+
### PARAMETERS
1768+
#### -ADConnectorName
1769+
AD connector name for which user source anchors needs to be repaired
1770+
```yaml
1771+
Type: Object
1772+
Parameter Sets: (All)
1773+
Aliases:
1774+
Required: true
1775+
Position: 1
1776+
Default value:
1777+
Accept pipeline input: True (ByPropertyName)
1778+
Accept wildcard characters: False
1779+
```
1780+
#### CommonParameters
1781+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).
1782+
1783+
## Set-ADSyncToolsDuplicateUsersSourceAnchor
1784+
### SYNOPSIS
1785+
Fixes all the objects with "Source Anchor has changed" error.
1786+
### SYNTAX
1787+
```
1788+
et-ADSyncToolsDuplicateUsersSourceAnchor [-DuplicateUserSourceAnchorInfo] <DuplicateUserSourceAnchorInfo> [-ActiveDirectoryCredential <PSCredential>] [-OverridePrompt <Boolean>] [<CommonParameters>]
1789+
```
1790+
### DESCRIPTION
1791+
This cmdlet takes in the list of objects from Get-ADSyncToolsDuplicateUsersSourceAnchor as pipeline input. It then fixes the sync errors by updating the msDS-ConsistencyGuid attribute with the sourceAnchor/immutableID of the original object.
1792+
The cmdlet has an optional parameter - "Override prompt", which is False by default. If it is set to True, then the user will not be prompted when updating the msDS-ConsistencyGuid attribute.
1793+
1794+
### EXAMPLES
1795+
#### EXAMPLE 1
1796+
```
1797+
Get-ADSyncToolsDuplicateUsersSourceAnchor -ADConnectorName Contoso.lab | Set-ADSyncToolsDuplicateUsersSourceAnchor
1798+
```
1799+
#### EXAMPLE 2
1800+
```
1801+
Get-ADSyncToolsDuplicateUsersSourceAnchor -ADConnectorName Contoso.lab | Set-ADSyncToolsDuplicateUsersSourceAnchor -OverridePrompt $true
1802+
```
1803+
### PARAMETERS
1804+
#### -DuplicateUserSourceAnchorInfo
1805+
User list for which the source anchor needs to be fixed
1806+
```yaml
1807+
Type: DuplicateUserSourceAnchorInfo
1808+
Parameter Sets: (All)
1809+
Aliases:
1810+
Required: True
1811+
Position: 1
1812+
Default value:
1813+
Accept pipeline input: True (ByValue, ByPropertyName)
1814+
Accept wildcard characters: False
1815+
```
1816+
#### -ActiveDirectoryCredential
1817+
AD EA/DA Admin Credentials, If not provided default credentials will be used
1818+
```yaml
1819+
Type: PSCredential
1820+
Parameter Sets: (All)
1821+
Aliases:
1822+
Required: False
1823+
Position: Named
1824+
Default value:
1825+
Accept pipeline input: False
1826+
Accept wildcard characters: False
1827+
```
1828+
#### -OverridePrompt
1829+
```yaml
1830+
Type: Boolean
1831+
Parameter Sets: (All)
1832+
Aliases:
1833+
Required: False
1834+
Position: Named
1835+
Default value: False
1836+
Accept pipeline input: False
1837+
Accept wildcard characters: False
1838+
```
1839+
#### CommonParameters
1840+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](/powershell/module/microsoft.powershell.core/about/about_commonparameters).

articles/aks/cluster-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Additionally not all VM images support Gen2, on AKS Gen2 VMs will use the new [A
5959

6060
## Ephemeral OS
6161

62-
By default, Azure automatically replicates the operating system disk for a virtual machine to Azure storage to avoid data loss should the VM need to be relocated to another host. However, since containers aren't designed to have local state persisted, this behavior offers limited value while providing some drawbacks, including slower node provisioning and higher read/write latency.
62+
By default, Azure automatically replicates the operating system disk for a virtual machine to Azure storage to avoid data loss if the VM needs to be relocated to another host. However, since containers aren't designed to have local state persisted, this behavior offers limited value while providing some drawbacks, including slower node provisioning and higher read/write latency.
6363

6464
By contrast, ephemeral OS disks are stored only on the host machine, just like a temporary disk. This provides lower read/write latency, along with faster node scaling and cluster upgrades.
6565

articles/cognitive-services/cognitive-services-container-support.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ Azure Cognitive Services containers provide the following set of Docker containe
6464
|--|--|--|
6565
| [Speech Service API][sp-containers-stt] | **Speech-to-text** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-custom-speech-to-text)) | Transcribes continuous real-time speech into text. | Generally available. <br> This container can also [run in disconnected environments](containers/disconnected-containers.md). |
6666
| [Speech Service API][sp-containers-cstt] | **Custom Speech-to-text** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-custom-speech-to-text)) | Transcribes continuous real-time speech into text using a custom model. | Generally available |
67-
| [Speech Service API][sp-containers-tts] | **Text-to-speech** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-text-to-speech)) | Converts text to natural-sounding speech. | Generally available |
68-
| [Speech Service API][sp-containers-ctts] | **Custom Text-to-speech** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-custom-text-to-speech)) | Converts text to natural-sounding speech using a custom model. | Gated preview |
6967
| [Speech Service API][sp-containers-ntts] | **Neural Text-to-speech** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-neural-text-to-speech)) | Converts text to natural-sounding speech using deep neural network technology, allowing for more natural synthesized speech. | Generally available. <br> container can also [run in disconnected environments](containers/disconnected-containers.md). |
7068
| [Speech Service API][sp-containers-lid] | **Speech language detection** ([image](https://hub.docker.com/_/microsoft-azure-cognitive-services-speechservices-language-detection)) | Determines the language of spoken audio. | Gated preview |
7169

articles/virtual-machines/disks-pools-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ For your disk pool to work with your client machines, you must delegate a subnet
5454
1. Go to the virtual networks pane in the Azure portal and select the virtual network to use for the disk pool.
5555
1. Select **Subnets** from the virtual network pane and select **+Subnet**.
5656
1. Create a new subnet by completing the following required fields in the **Add subnet** pane:
57-
- Subnet delegation: Select Microsoft.StoragePool
57+
- Subnet delegation: Select Microsoft.StoragePool/diskPools
5858

5959
For more information on subnet delegation, see [Add or remove a subnet delegation](../virtual-network/manage-subnet-delegation.md).
6060

0 commit comments

Comments
 (0)