Skip to content

Commit 379d48d

Browse files
Merge pull request #252516 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 5e5cd98 + 97f48bf commit 379d48d

18 files changed

+173
-98
lines changed

articles/active-directory/develop/custom-extension-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ The following JSON snippet demonstrates how to configure these properties.
408408

409409
## Step 4: Assign a custom claims provider to your app
410410

411-
For tokens to be issued with claims incoming from the custom authentication extension, you must assign a custom claims provider to your application. This is based on the token audience, so the provider must be assgined to the client application to receive claims in an ID token, and to the resource application to receive claims in an access token. The custom claims provider relies on the custom authentication extension configured with the **token issuance start** event listener. You can choose whether all, or a subset of claims, from the custom claims provider are mapped into the token.
411+
For tokens to be issued with claims incoming from the custom authentication extension, you must assign a custom claims provider to your application. This is based on the token audience, so the provider must be assigned to the client application to receive claims in an ID token, and to the resource application to receive claims in an access token. The custom claims provider relies on the custom authentication extension configured with the **token issuance start** event listener. You can choose whether all, or a subset of claims, from the custom claims provider are mapped into the token.
412412

413413
Follow these steps to connect the *My Test application* with your custom authentication extension:
414414

articles/active-directory/hybrid/cloud-sync/reference-powershell.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,21 @@ This cmdlet modifies *AADConnectProvisioningAgent.exe.config* to disable verbose
142142

143143
This cmdlet pauses synchronization.
144144

145+
### Disable-AADCloudSyncToolsDirSyncAccidentalDeletionPrevention
146+
147+
Disables accidentalDeletionPrevention tenant feature
148+
``` powershell
149+
Disable-AADCloudSyncToolsDirSyncAccidentalDeletionPrevention -tenantId <TenantId>
150+
```
151+
152+
This cmdlet requires `TenantId` of the Azure AD tenant. It will verify if Accidental Deletion Prevention feature, set on the tenant with Azure AD Connect (ADSync, not Cloud Sync), is enabled and disables it.
153+
154+
#### Example:
155+
``` powershell
156+
Disable-AADCloudSyncToolsDirSyncAccidentalDeletionPrevention -tenantId "340ab039-1234-5678-9012-28fe88f83980"
157+
```
158+
159+
145160
## Next steps
146161

147162
- [What is provisioning?](../what-is-provisioning.md)

articles/azure-functions/functions-host-json-v1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ Configuration setting for the [SendGrind output binding](functions-bindings-send
294294
Configuration setting for [Service Bus triggers and bindings](functions-bindings-service-bus.md).
295295

296296
```json
297-
{
297+
{ "extensions":
298298
"serviceBus": {
299299
"maxConcurrentCalls": 16,
300300
"prefetchCount": 100,

articles/azure-resource-manager/management/async-operations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ There are two different ways to monitor the status the asynchronous operation. Y
3636

3737
If `Azure-AsyncOperation` isn't one of the header values, then look for:
3838

39-
* `Location` - URL for determining when an operation has completed. Only use this value only when `Azure-AsyncOperation` isn't returned.
39+
* `Location` - URL for determining when an operation has completed. Use this value only when `Azure-AsyncOperation` isn't returned.
4040
* `Retry-After` - The number of seconds to wait before checking the status of the asynchronous operation.
4141

4242
> [!NOTE]
@@ -205,4 +205,4 @@ If the request is still running, you receive a status code 202. If the request h
205205
## Next steps
206206

207207
* For documentation about each REST operation, see [REST API documentation](/rest/api/azure/).
208-
* For information about deploying templates through the Resource Manager REST API, see [Deploy resources with Resource Manager templates and Resource Manager REST API](../templates/deploy-rest.md).
208+
* For information about deploying templates through the Resource Manager REST API, see [Deploy resources with Resource Manager templates and Resource Manager REST API](../templates/deploy-rest.md).

articles/batch/batch-docker-container-workloads.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,31 @@ For Linux container workloads, Batch currently supports the following Linux imag
7272
- Offer: `centos-container-rdma`
7373
- Offer: `ubuntu-server-container-rdma`
7474

75+
- Publisher: `microsoft-dsvm`
76+
- Offer: `ubuntu-hpc`
77+
78+
#### Notes
79+
The docker data root of the above images lies in different places:
80+
- For the batch image `microsoft-azure-batch` (Offer: `centos-container-rdma`, etc), the docker data root is mapped to `/mnt/batch/docker`, which is usually located on the temporary disk.
81+
- For the HPC image, or `microsoft-dsvm` (Offer: `ubuntu-hpc`, etc), the docker data root is unchanged from the Docker default which is `/var/lib/docker` on Linux and `C:\ProgramData\Docker` on Windows. These folders are usually located on the OS disk.
82+
83+
When using non-Batch images, the OS disk has the potential risk of being filled up quickly as container images are downloaded.
84+
#### Potential solutions for customer
85+
86+
Change the docker data root in a start task when creating a pool in BatchExplorer. Here's an example of the Start Task command:
87+
```csharp
88+
1) sudo systemctl stop docker
89+
2) sudo vi /lib/systemd/system/docker.service
90+
+++
91+
FROM:
92+
ExecStart=/usr/bin/docker daemon -H fd://
93+
TO:
94+
ExecStart=/usr/bin/docker daemon -g /new/path/docker -H fd://
95+
+++
96+
3) sudo systemctl daemon-reload
97+
4) sudo systemctl start docker
98+
```
99+
75100
These images are only supported for use in Azure Batch pools and are geared for Docker container execution. They feature:
76101

77102
- A pre-installed Docker-compatible [Moby container runtime](https://github.com/moby/moby).

articles/machine-learning/how-to-debug-pipeline-reuse-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Azure Machine Learning pipeline has holistic logic to calculate whether a compon
3636

3737
Reuse criteria:
3838

39-
- Component definition `is_determinstic` = true
39+
- Component definition `is_deterministic` = true
4040
- Pipeline runtime setting `ForceReRun` = false
4141
- Component code, environment definition, inputs and parameters, output settings, and run settings are all the same.
4242

articles/machine-learning/prompt-flow/how-to-end-to-end-llmops-with-prompt-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Go to workspace portal, select **Prompt flow** -> **Runtime** -> **Add**, then f
151151
Clone repo to your local machine.
152152

153153
```bash
154-
git clone https://github.com/<user-name>/llmops-pipeline
154+
git clone https://github.com/<user-name>/llmops-gha-demo
155155
```
156156

157157
### Update workflow to connect to your Azure Machine Learning workspace

articles/search/tutorial-optimize-indexing-push-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The following services and tools are required for this tutorial.
3939

4040
## Download files
4141

42-
Source code for this tutorial is in the [optimzize-data-indexing/v11](https://github.com/Azure-Samples/azure-search-dotnet-scale/tree/main/optimize-data-indexing/v11) folder in the [Azure-Samples/azure-search-dotnet-samples](https://github.com/Azure-Samples/azure-search-dotnet-samples) GitHub repository.
42+
Source code for this tutorial is in the [optimize-data-indexing/v11](https://github.com/Azure-Samples/azure-search-dotnet-scale/tree/main/optimize-data-indexing/v11) folder in the [Azure-Samples/azure-search-dotnet-samples](https://github.com/Azure-Samples/azure-search-dotnet-samples) GitHub repository.
4343

4444
## Key considerations
4545

articles/service-bus-messaging/message-deferral.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ Try the samples in the language of your choice to explore Azure Service Bus feat
3737
See samples for the older .NET and Java client libraries here:
3838
- [Azure Service Bus client library samples for .NET (legacy)](https://github.com/Azure/azure-service-bus/tree/master/samples/DotNet/Microsoft.Azure.ServiceBus/) - See the **Deferral** sample.
3939
- [Azure Service Bus client library samples for Java (legacy)](https://github.com/Azure/azure-service-bus/tree/master/samples/Java/azure-servicebus/MessageBrowse)
40+
41+
## Related resources
42+
43+
- [Tutorial showing the use of message deferral as a part of a workflow, using NServiceBus](https://docs.particular.net/tutorials/nservicebus-sagas/2-timeouts/)

articles/spring-apps/how-to-configure-health-probes-graceful-termination.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Use the following steps to customize your application using Azure CLI.
198198

199199
## Best practices
200200

201-
Use the following best practices when adding your own persistent storage to Azure Spring Apps:
201+
Use the following best practices when adding health probes to Azure Spring Apps:
202202

203203
- Use liveness and readiness probes together. Azure Spring Apps provides two approaches for service discovery at the same time. When the readiness probe fails, the app instance is removed only from Kubernetes service discovery. A properly configured liveness probe can remove the issued app instance from Eureka service discovery to avoid unexpected cases. For more information about service discovery, see [Discover and register your Spring Boot applications](how-to-service-registration.md).
204204

0 commit comments

Comments
 (0)