Skip to content

Commit 30e014f

Browse files
authored
Merge pull request #248779 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 e877812 + d117bcd commit 30e014f

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

articles/active-directory/architecture/recoverability-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Create a process of predefined communications to make others aware of the issue
100100
Document the state of your tenant and its objects regularly. Then if a hard delete or misconfiguration occurs, you have a roadmap to recovery. The following tools can help you document your current state:
101101

102102
- [Microsoft Graph APIs](/graph/overview) can be used to export the current state of many Azure AD configurations.
103-
- [Azure AD Exporter](https://github.com/microsoft/azureadexporter) is a tool you can use to export your configuration settings.
103+
- [Entra Exporter](https://github.com/microsoft/entraexporter) is a tool you can use to export your configuration settings.
104104
- [Microsoft 365 Desired State Configuration](https://github.com/microsoft/Microsoft365DSC/wiki/What-is-Microsoft365DSC) is a module of the PowerShell Desired State Configuration framework. You can use it to export configurations for reference and application of the prior state of many settings.
105105
- [Conditional Access APIs](https://github.com/Azure-Samples/azure-ad-conditional-access-apis) can be used to manage your Conditional Access policies as code.
106106

articles/key-vault/general/rbac-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: "devx-track-azurepowershell, devx-track-azurecli"
1616
> Key Vault resource provider supports two resource types: **vaults** and **managed HSMs**. Access control described in this article only applies to **vaults**. To learn more about access control for managed HSM, see [Managed HSM access control](../managed-hsm/access-control.md).
1717
1818
> [!NOTE]
19-
> Azure App Service certificate configuration through Azure Portal does not support Key Vault RBAC permission model, but you can use Azure PowerShell, Azure CLI, ARM template deployments. App Service certtifate management requires **Key Vault Secrets User** and **Key Vault Reader** role assignments for App Service global identity, for example Microsoft Azure App Service' in public cloud.
19+
> Azure App Service certificate configuration through Azure Portal does not support Key Vault RBAC permission model, but you can use Azure PowerShell, Azure CLI, ARM template deployments. App Service certificate management requires **Key Vault Secrets User** and **Key Vault Reader** role assignments for App Service global identity, for example Microsoft Azure App Service' in public cloud.
2020
2121
Azure role-based access control (Azure RBAC) is an authorization system built on [Azure Resource Manager](../../azure-resource-manager/management/overview.md) that provides fine-grained access management of Azure resources.
2222

articles/logic-apps/edit-app-settings-host-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ The following settings work only for workflows that start with a recurrence-base
183183

184184
| Setting | Default value | Description |
185185
|---------|---------------|-------------|
186-
| `Runtime.Backend.FlowRunTimeout` | `90.00:00:00` <br>(90 days) | Sets the amount of time a workflow can continue running before forcing a timeout. <br><br>**Important**: Make sure this value is less than or equal to the value for the app setting named `Workflows.RuntimeConfiguration.RetentionInDays`. Otherwise, run histories can get deleted before the associated jobs are complete. The minimum value for this setting is 7 days. |
186+
| `Runtime.Backend.FlowRunTimeout` | `90.00:00:00` <br>(90 days) | Sets the amount of time a workflow can continue running before forcing a timeout. The minimum value for this setting is 7 days. <br><br>**Important**: Make sure this value is less than or equal to the value for the app setting named `Workflows.RuntimeConfiguration.RetentionInDays`. Otherwise, run histories can get deleted before the associated jobs are complete. |
187187
| `Runtime.FlowMaintenanceJob.RetentionCooldownInterval` | `7.00:00:00` <br>(7 days) | Sets the amount of time in days as the interval between when to check for and delete run history that you no longer want to keep. |
188188

189189
<a name="run-actions"></a>

articles/machine-learning/how-to-secure-online-endpoint.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,11 @@ When prompted, enter the password you used when creating the VM.
285285
286286
# [Generic model](#tab/model)
287287

288-
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet.sh" id="set_env_vars":::
288+
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet-legacy.sh" id="set_env_vars":::
289289

290290
# [MLflow model](#tab/mlflow)
291291

292-
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet-mlflow.sh" id="set_env_vars":::
292+
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet-mlflow-legacy.sh" id="set_env_vars":::
293293

294294
---
295295

@@ -332,11 +332,11 @@ When prompted, enter the password you used when creating the VM.
332332
333333
To delete the endpoint, use the following command:
334334
335-
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet.sh" id="delete_endpoint":::
335+
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet-legacy.sh" id="delete_endpoint":::
336336
337337
To delete the VM, use the following command:
338338
339-
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet.sh" id="delete_vm":::
339+
:::code language="azurecli" source="~/azureml-examples-main/cli/deploy-moe-vnet-legacy.sh" id="delete_vm":::
340340
341341
To delete all the resources created in this article, use the following command. Replace `<resource-group-name>` with the name of the resource group used in this example:
342342

articles/sap/workloads/hana-vm-premium-ssd-v1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ The caching recommendations for Azure premium disks below are assuming the I/O c
4040

4141
**Recommendation: As a result of these observed I/O patterns by SAP HANA, the caching for the different volumes using Azure premium storage should be set like:**
4242

43-
- **/hana/data** - no caching or read caching
44-
- **/hana/log** - no caching - exception for M- and Mv2-Series VMs where Azure Write Accelerator should be enabled
43+
- **/hana/data** - None or read caching
44+
- **/hana/log** - None. Enable Write Accelerator for M- and Mv2-Series VMs, the option in the Azure portal is "None + Write Accelerator."
4545
- **/hana/shared** - read caching
4646
- **OS disk** - don't change default caching that is set by Azure at creation time of the VM
4747

0 commit comments

Comments
 (0)