Skip to content

Commit f332869

Browse files
authored
Merge pull request #110708 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 0aa956f + d452af8 commit f332869

File tree

4 files changed

+44
-11
lines changed

4 files changed

+44
-11
lines changed

articles/active-directory/hybrid/how-to-connect-syncservice-features.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,14 @@ Set-MsolDirSyncFeature -Feature EnableSoftMatchOnUpn -Enable $true
8484

8585
## Synchronize userPrincipalName updates
8686

87-
Historically, updates to the UserPrincipalName attribute using the sync service from on-premises has been blocked, unless both of these conditions are true:
87+
Historically, updates to the UserPrincipalName attribute using the sync service from on-premises has been blocked, unless both of these conditions were true:
8888

8989
* The user is managed (non-federated).
9090
* The user has not been assigned a license.
9191

92-
For more details, see [User names in Office 365, Azure, or Intune don't match the on-premises UPN or alternate login ID](https://support.microsoft.com/kb/2523192).
92+
> [!NOTE]
93+
> From March 2019, synchronizing UPN changes for federated user accounts is allowed.
94+
>
9395
9496
Enabling this feature allows the sync engine to update the userPrincipalName when it is changed on-premises and you use password hash sync or pass-through authentication.
9597

articles/load-balancer/load-balancer-ipv6-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ Limitations
7676
* Changing the loadDistributionMethod parameter for IPv6 is **currently not supported**.
7777
* Reserved IPv6 IPs (where IPAllocationMethod = static) are **currently not supported**.
7878
* NAT64 (translation of IPv6 to IPv4) is not supported.
79+
* Attaching a secondary NIC that refers to an IPv6 subnet to a back-end pool is **currently not supported**.
7980

8081
## Next steps
8182

articles/sql-database/sql-database-elastic-pool.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ For more information, see [create SQL Database alerts in Azure portal](sql-datab
220220

221221
- For pricing information, see [Elastic pool pricing](https://azure.microsoft.com/pricing/details/sql-database/elastic).
222222
- To scale elastic pools, see [Scaling elastic pools](sql-database-elastic-pool-scale.md) and [Scale an elastic pool - sample code](scripts/sql-database-monitor-and-scale-pool-powershell.md)
223-
- For a video, see [Microsoft Virtual Academy video course on Azure SQL Database elastic capabilities](https://mva.microsoft.com/training-courses/elastic-database-capabilities-with-azure-sql-db-16554)
224223
- To learn more about design patterns for SaaS applications using elastic pools, see [Design Patterns for Multi-tenant SaaS Applications with Azure SQL Database](sql-database-design-patterns-multi-tenancy-saas-applications.md).
225224
- For a SaaS tutorial using elastic pools, see [Introduction to the Wingtip SaaS application](sql-database-wtp-overview.md).
226225
- To learn about resource management in elastic pools with many databases, see [Resource management in dense elastic pools](sql-database-elastic-pool-resource-management.md).

articles/virtual-machines/extensions/custom-script-linux.md

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ Here you can see:
448448
* The extension downloading file and the result of that.
449449
* The command being run and the result.
450450

451-
You can also retrieve the execution state of the Custom Script Extension by using Azure CLI:
451+
You can also retrieve the execution state of the Custom Script Extension including the actual arguments passed as the `commandToExecute` by using Azure CLI:
452452

453453
```azurecli
454454
az vm extension list -g myResourceGroup --vm-name myVM
@@ -457,13 +457,44 @@ az vm extension list -g myResourceGroup --vm-name myVM
457457
The output looks like the following text:
458458

459459
```output
460-
info: Executing command vm extension get
461-
+ Looking up the VM "scripttst001"
462-
data: Publisher Name Version State
463-
data: -------------------------- ---------------------------------------- ------- ---------
464-
data: Microsoft.Azure.Extensions CustomScript 2.0 Succeeded
465-
data: Microsoft.OSTCExtensions Microsoft.Insights.VMDiagnosticsSettings 2.3 Succeeded
466-
info: vm extension get command OK
460+
[
461+
{
462+
"autoUpgradeMinorVersion": true,
463+
"forceUpdateTag": null,
464+
"id": "/subscriptions/subscriptionid/resourceGroups/rgname/providers/Microsoft.Compute/virtualMachines/vmname/extensions/customscript",
465+
"resourceGroup": "rgname",
466+
"settings": {
467+
"commandToExecute": "sh script.sh > ",
468+
"fileUris": [
469+
"https://catalogartifact.azureedge.net/publicartifacts/scripts/script.sh",
470+
"https://catalogartifact.azureedge.net/publicartifacts/scripts/script.sh"
471+
]
472+
},
473+
"tags": null,
474+
"type": "Microsoft.Compute/virtualMachines/extensions",
475+
"typeHandlerVersion": "2.0",
476+
"virtualMachineExtensionType": "CustomScript"
477+
},
478+
{
479+
"autoUpgradeMinorVersion": true,
480+
"forceUpdateTag": null,
481+
"id": "/subscriptions/subscriptionid/resourceGroups/rgname/providers/Microsoft.Compute/virtualMachines/vmname/extensions/OmsAgentForLinux",
482+
"instanceView": null,
483+
"location": "eastus",
484+
"name": "OmsAgentForLinux",
485+
"protectedSettings": null,
486+
"provisioningState": "Succeeded",
487+
"publisher": "Microsoft.EnterpriseCloud.Monitoring",
488+
"resourceGroup": "rgname",
489+
"settings": {
490+
"workspaceId": "workspaceid"
491+
},
492+
"tags": null,
493+
"type": "Microsoft.Compute/virtualMachines/extensions",
494+
"typeHandlerVersion": "1.0",
495+
"virtualMachineExtensionType": "OmsAgentForLinux"
496+
}
497+
]
467498
```
468499

469500
## Next steps

0 commit comments

Comments
 (0)