Skip to content

Commit c4617f5

Browse files
authored
Merge pull request #221016 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 ff9b29c + 7636f0f commit c4617f5

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed

articles/active-directory/app-provisioning/on-premises-application-provisioning-architecture.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ There are three primary components to provisioning users into an on-premises app
3737

3838
You don't need to open inbound connections to the corporate network. The provisioning agents only use outbound connections to the provisioning service, which means there's no need to open firewall ports for incoming connections. You also don't need a perimeter (DMZ) network because all connections are outbound and take place over a secure channel.
3939

40+
The required outbound endpoints for the provisioning agents are detailed [here](../cloud-sync/how-to-prerequisites.md#firewall-and-proxy-requirements).
41+
4042
## ECMA Connector Host architecture
4143
The ECMA Connector Host has several areas it uses to achieve on-premises provisioning. The diagram below is a conceptual drawing that presents these individual areas. The table below describes the areas in more detail.
4244

articles/azure-monitor/containers/container-insights-reports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To create a custom workbook based on any of these workbooks, select the **View W
3939
4040
- **Subnet IP Usage**: Interactive IP usage charts for each node within a cluster by the following perspectives:
4141

42-
- IPs allocated form subnet.
42+
- IPs allocated from subnet.
4343
- IPs assigned to a pod.
4444

4545
>[!NOTE]

articles/communication-services/quickstarts/email/includes/send-email-net.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ var emailAttachment = new EmailAttachment(
232232
attachmentFileInBytes
233233
);
234234

235-
emailMessage.Add(emailAttachment);
235+
emailMessage.Attachments.Add(emailAttachment);
236236
```
237237

238238
You can download the sample app demonstrating this from [GitHub](https://github.com/Azure-Samples/communication-services-dotnet-quickstarts/tree/main/SendEmailAdvanced/SendEmailWithAttachments)

articles/event-grid/receive-events.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ namespace Function1
6969
{
7070
log.LogInformation($"Got SubscriptionValidation event data, validation code: {subscriptionValidationEventData.ValidationCode}, topic: {eventGridEvent.Topic}");
7171
// Do any additional validation (as required) and then return back the below response
72-
73-
var responseData = new SubscriptionValidationResponse()
72+
var responseData = new
7473
{
7574
ValidationResponse = subscriptionValidationEventData.ValidationCode
7675
};
76+
7777
return new OkObjectResult(responseData);
7878
}
7979
}
@@ -171,7 +171,7 @@ namespace Function1
171171
log.LogInformation($"Got SubscriptionValidation event data, validation code: {subscriptionValidationEventData.ValidationCode}, topic: {eventGridEvent.Topic}");
172172
// Do any additional validation (as required) and then return back the below response
173173
174-
var responseData = new SubscriptionValidationResponse()
174+
var responseData = new
175175
{
176176
ValidationResponse = subscriptionValidationEventData.ValidationCode
177177
};
@@ -305,7 +305,7 @@ namespace Function1
305305
log.LogInformation($"Got SubscriptionValidation event data, validation code: {subscriptionValidationEventData.ValidationCode}, topic: {eventGridEvent.Topic}");
306306
// Do any additional validation (as required) and then return back the below response
307307
308-
var responseData = new SubscriptionValidationResponse()
308+
var responseData = new
309309
{
310310
ValidationResponse = subscriptionValidationEventData.ValidationCode
311311
};

articles/hdinsight/hdinsight-hadoop-use-data-lake-storage-gen2-azure-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ az storage account create --name <STORAGEACCOUNTNAME> \
6565
--kind StorageV2 --hierarchical-namespace true
6666
```
6767

68-
Next, sign in to the portal. Add the new user-assigned managed identity to the **Storage Blob Data Contributor** role on the storage account. This step is described in step 3 under [Using the Azure portal](hdinsight-hadoop-use-data-lake-storage-gen2.md).
68+
Next, sign in to the portal. Add the new user-assigned managed identity to the **Storage Blob Data Owner** role on the storage account. This step is described in step 3 under [Using the Azure portal](hdinsight-hadoop-use-data-lake-storage-gen2.md).
6969

7070
> [!IMPORTANT]
71-
> Ensure that your storage account has the user-assigned identity with **Storage Blob Data Contributor** role permissions, otherwise cluster creation will fail.
71+
> Ensure that your storage account has the user-assigned identity with **Storage Blob Data Owner** role permissions, otherwise cluster creation will fail.
7272
7373
```azurecli
7474
az deployment group create --name HDInsightADLSGen2Deployment \

articles/machine-learning/reference-yaml-mltable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The source JSON schema can be found at https://azuremlschemas.azureedge.net/late
3131

3232

3333
> [!Note]
34-
> If you just want to create an data asset for a job or you want to write your own parsing logic in python you could just use `uri_file`, `uri_folder` as mentioned in [CLI (v2) data YAML schema](reference-yaml-data.md).
34+
> If you just want to create an data asset for a job or you want to write your own parsing logic in Python you could just use `uri_file`, `uri_folder` as mentioned in [CLI (v2) data YAML schema](reference-yaml-data.md).
3535
3636

3737
[!INCLUDE [schema note](../../includes/machine-learning-preview-old-json-schema-note.md)]

articles/spring-apps/quickstart-deploy-apps-enterprise.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ Use the following steps to deploy and build applications. For these steps, make
248248
--name payment-service \
249249
--service <Azure-Spring-Apps-service-instance-name> \
250250
--config-file-pattern payment/default \
251-
--source-path apps/acme-payment
251+
--source-path apps/acme-payment \
252+
--build-env BP_JVM_VERSION=17
252253
```
253254

254255
1. Use the following command to build and deploy the catalog service:
@@ -259,7 +260,8 @@ Use the following steps to deploy and build applications. For these steps, make
259260
--name catalog-service \
260261
--service <Azure-Spring-Apps-service-instance-name> \
261262
--config-file-pattern catalog/default \
262-
--source-path apps/acme-catalog
263+
--source-path apps/acme-catalog \
264+
--build-env BP_JVM_VERSION=17
263265
```
264266

265267
1. Use the following command to build and deploy the order service:

0 commit comments

Comments
 (0)