Skip to content

Commit 5775b8c

Browse files
authored
Merge pull request #278279 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 ab29ebb + 5025183 commit 5775b8c

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

articles/ai-services/openai/assistants-reference-messages.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Create a message.
3636

3737
|Name | Type | Required | Description |
3838
|--- |--- |--- |--- |
39-
| `role` | string | Required | The role of the entity that is creating the message. Can be `user` or `assistant`. `assistant` indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages. `assistant` indicates the message is generated by the assistant. Use this value to insert messages from the assistant into the conversation. |
39+
| `role` | string | Required | The role of the entity that is creating the message. Can be `user` or `assistant`. `user` indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages. `assistant` indicates the message is generated by the assistant. Use this value to insert messages from the assistant into the conversation. |
4040
| `content` | string | Required | The content of the message. |
4141
| `file_ids` | array | Optional | A list of File IDs that the message should use. There can be a maximum of 10 files attached to a message. Useful for tools like retrieval and code_interpreter that can access and use files. |
4242
| `metadata` | map | Optional | Set of 16 key-value pairs that can be attached to an object. This can be useful for storing additional information about the object in a structured format. Keys can be a maximum of 64 characters long and values can be a maximum of 512 characters long. |
@@ -371,7 +371,7 @@ Represents a message within a thread.
371371
| `object` | string |The object type, which is always thread.message.|
372372
| `created_at` | integer |The Unix timestamp (in seconds) for when the message was created.|
373373
| `thread_id` | string |The thread ID that this message belongs to.|
374-
| `role` | string |The entity that produced the message. One of user or assistant.|
374+
| `role` | string |The entity that produced the message. One of `user` or `assistant`.|
375375
| `content` | array |The content of the message in array of text and/or images.|
376376
| `assistant_id` | string or null |If applicable, the ID of the assistant that authored this message.|
377377
| `run_id` | string or null |If applicable, the ID of the run associated with the authoring of this message.|

articles/aks/outbound-rules-control-egress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following network and FQDN/application rules are required for an AKS cluster
6060
|----------------------------------|-----------------|----------|
6161
| **`*.hcp.<location>.azmk8s.io`** | **`HTTPS:443`** | Required for Node <-> API server communication. Replace *\<location\>* with the region where your AKS cluster is deployed. This is required for clusters with *konnectivity-agent* enabled. Konnectivity also uses Application-Layer Protocol Negotiation (ALPN) to communicate between agent and server. Blocking or rewriting the ALPN extension will cause a failure. This isn't required for [private clusters][private-clusters]. |
6262
| **`mcr.microsoft.com`** | **`HTTPS:443`** | Required to access images in Microsoft Container Registry (MCR). This registry contains first-party images/charts (for example, coreDNS, etc.). These images are required for the correct creation and functioning of the cluster, including scale and upgrade operations. |
63-
| **`*.data.mcr.microsoft.com`** | **`HTTPS:443`** | Required for MCR storage backed by the Azure content delivery network (CDN). |
63+
| **`*.data.mcr.microsoft.com`**, **`mcr-0001.mcr-msedge.net`** | **`HTTPS:443`** | Required for MCR storage backed by the Azure content delivery network (CDN). |
6464
| **`management.azure.com`** | **`HTTPS:443`** | Required for Kubernetes operations against the Azure API. |
6565
| **`login.microsoftonline.com`** | **`HTTPS:443`** | Required for Microsoft Entra authentication. |
6666
| **`packages.microsoft.com`** | **`HTTPS:443`** | This address is the Microsoft packages repository used for cached *apt-get* operations. Example packages include Moby, PowerShell, and Azure CLI. |

articles/azure-resource-manager/management/tag-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ To get the same data as a file of comma-separated values, download [tag-support.
418418
> | billingAccounts / appliedReservationOrders | No | No |
419419
> | billingAccounts / associatedTenants | No | No |
420420
> | billingAccounts / billingPermissions | No | No |
421-
> | billingAccounts / billingProfiles | No | No |
421+
> | billingAccounts / billingProfiles | Yes | Yes |
422422
> | billingAccounts / billingProfiles / billingPermissions | No | No |
423423
> | billingAccounts / billingProfiles / billingRoleAssignments | No | No |
424424
> | billingAccounts / billingProfiles / billingRoleDefinitions | No | No |
@@ -429,7 +429,7 @@ To get the same data as a file of comma-separated values, download [tag-support.
429429
> | billingAccounts / billingProfiles / invoices | No | No |
430430
> | billingAccounts / billingProfiles / invoices / pricesheet | No | No |
431431
> | billingAccounts / billingProfiles / invoices / transactions | No | No |
432-
> | billingAccounts / billingProfiles / invoiceSections | No | No |
432+
> | billingAccounts / billingProfiles / invoiceSections | Yes | Yes |
433433
> | billingAccounts / billingProfiles / invoiceSections / billingPermissions | No | No |
434434
> | billingAccounts / billingProfiles / invoiceSections / billingRoleAssignments | No | No |
435435
> | billingAccounts / billingProfiles / invoiceSections / billingRoleDefinitions | No | No |

articles/machine-learning/how-to-managed-network.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,7 @@ The Azure Machine Learning managed VNet feature is free. However, you're charged
11111111
* Using FQDN outbound rules increases the cost of the managed VNet because FQDN rules use Azure Firewall. For more information, see [Pricing](#pricing).
11121112
* FQDN outbound rules only support ports 80 and 443.
11131113
* If your compute instance is in a managed network and is configured for no public IP, use the `az ml compute connect-ssh` command to connect to it using SSH.
1114+
* When using Managed Vnet, you can't deploy compute resources inside your custom Vnet. Compute resources can only be created inside the managed Vnet.
11141115

11151116
### Migration of compute resources
11161117

0 commit comments

Comments
 (0)