Skip to content

Commit b8cbc6c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into filesAD
2 parents 8cd018f + 41b3d1d commit b8cbc6c

File tree

4 files changed

+31
-9
lines changed

4 files changed

+31
-9
lines changed

articles/active-directory/app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,12 @@ Scoping filters are configured as part of the attribute mappings for each Azure
9393
i. **Greater_Than.** Clause returns "true" if the evaluated attribute is greater than the value. The value specified on the scoping filter must be an integer and the attribute on the user must be an integer [0,1,2,...].
9494

9595
j. **Greater_Than_OR_EQUALS.** Clause returns "true" if the evaluated attribute is greater than or equal to the value. The value specified on the scoping filter must be an integer and the attribute on the user must be an integer [0,1,2,...].
96+
97+
k. **Includes.** Clause returns "true" if the evaluated attribute contains the string value (case sensitive) as described [here](https://docs.microsoft.com/dotnet/api/system.string.contains?view=netframework-4.8).
9698

9799

98100
>[!IMPORTANT]
99-
> The Includes and IsMemberOf filters are not supported. They will soon be removed from the UI.
101+
> The IsMemberOf filter is not supported currently.
100102
101103
9. Optionally, repeat steps 7-8 to add more scoping clauses.
102104

articles/aks/azure-ad-integration-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ oAuthPermissionId=$(az ad app show --id $serverApplicationId --query "oauth2Perm
119119
Add the permissions for the client application and server application components to use the oAuth2 communication flow using the [az ad app permission add][az-ad-app-permission-add] command. Then, grant permissions for the client application to communication with the server application using the [az ad app permission grant][az-ad-app-permission-grant] command:
120120

121121
```azurecli-interactive
122-
az ad app permission add --id $clientApplicationId --api $serverApplicationId --api-permissions $oAuthPermissionId=Scope
122+
az ad app permission add --id $clientApplicationId --api $serverApplicationId --api-permissions ${oAuthPermissionId}=Scope
123123
az ad app permission grant --id $clientApplicationId --api $serverApplicationId
124124
```
125125

articles/aks/private-clusters.md

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: mlearned
66

77
ms.service: container-service
88
ms.topic: article
9-
ms.date: 1/24/2020
9+
ms.date: 2/21/2020
1010
ms.author: mlearned
1111
---
1212

@@ -27,13 +27,33 @@ The control plane or API server is in an Azure Kubernetes Service (AKS)-managed
2727
* The Azure CLI version 2.0.77 or later, and the Azure CLI AKS Preview extension version 0.4.18
2828

2929
## Currently supported regions
30-
* West US
31-
* West US 2
32-
* East US 2
30+
31+
* Australia East
32+
* Australia Southeast
33+
* Brazil South
3334
* Canada Central
35+
* Canada East
36+
* Cenral US
37+
* East Asia
38+
* East US
39+
* East US 2
40+
* East US 2 EUAP
41+
* France Central
42+
* Germany North
43+
* Japan East
44+
* Japan West
45+
* Korea Central
46+
* Korea South
47+
* North Central US
3448
* North Europe
49+
* North Europe
50+
* South Central US
51+
* UK South
3552
* West Europe
36-
* Australia East
53+
* West US
54+
* West US 2
55+
* East US 2
56+
3757

3858
## Install the latest Azure CLI AKS Preview extension
3959

articles/container-instances/container-instances-encrypt-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The access policy should now show up in your key vault's access policies.
8585
> Encrypting deployment data with a customer-managed key is available in the latest API version (2019-12-01) that is currently rolling out. Specify this API version in your deployment template. If you have any issues with this, please reach out to Azure Support.
8686
8787
Once the key vault key and access policy are set up, add the following properties to your ACI deployment template. Learn more about deploying ACI resources with a template in the [Tutorial: Deploy a multi-container group using a Resource Manager template](https://docs.microsoft.com/azure/container-instances/container-instances-multi-container-group).
88-
* Under `resources`, set `apiVersion` to `2012-12-01`.
88+
* Under `resources`, set `apiVersion` to `2019-12-01`.
8989
* Under the container group properties section of the deployment template, add an `encryptionProperties`, which contains the following values:
9090
* `vaultBaseUrl`: the DNS Name of your key vault, can be found on the overview blade of the key vault resource in Portal
9191
* `keyName`: the name of the key generated earlier
@@ -231,4 +231,4 @@ Within a few seconds, you should receive an initial response from Azure. Once th
231231

232232
<!-- LINKS - Internal -->
233233
[az-group-create]: /cli/azure/group#az-group-create
234-
[az-group-deployment-create]: /cli/azure/group/deployment#az-group-deployment-create
234+
[az-group-deployment-create]: /cli/azure/group/deployment#az-group-deployment-create

0 commit comments

Comments
 (0)