Skip to content

Commit bc02085

Browse files
authored
Merge pull request #271769 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 b971ca4 + 925a930 commit bc02085

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

articles/azure-large-instances/workloads/epic/create-a-volume-group.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ Expected output: lists all the logical volumes created.
7171
[root @themetal05 ~] chown root:root /prod
7272
```
7373

74-
8. Add mount to /etc/fstab
74+
8. Add mount entries to /etc/fstab
7575

7676
```azurecli
77-
[root @themetal05 ~] /dev/mapper/prodvg-prod01 /prod01 xfs defaults 0 0
78-
[root @themetal05 ~] /dev/mapper/jrnvg-jrn /jrn xfs defaults 0 0
79-
[root @themetal05 ~] /dev/mapper/instvg-prd /prd xfs defaults 0 0
77+
/dev/mapper/prodvg-prod01 /prod01 xfs defaults 0 0
78+
/dev/mapper/jrnvg-jrn /jrn xfs defaults 0 0
79+
/dev/mapper/instvg-prd /prd xfs defaults 0 0
8080
```
8181

8282
9. Mount storage

articles/azure-resource-manager/bicep/deployment-script-bicep.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ The following table lists the error codes for the deployment script:
407407
| `DeploymentScriptStorageAccountAccessKeyNotSpecified` | The access key wasn't specified for the existing storage account.|
408408
| `DeploymentScriptContainerGroupContainsInvalidContainers` | A container group that the deployment script service created was externally modified, and invalid containers were added. |
409409
| `DeploymentScriptContainerGroupInNonterminalState` | Two or more deployment script resources use the same Azure container instance name in the same resource group, and one of them hasn't finished its execution yet. |
410+
| `DeploymentScriptExistingStorageNotInSameSubscriptionAsDeploymentScript` | The existing storage provided in deployment is not found in the subscription where the script is being deployed. |
410411
| `DeploymentScriptStorageAccountInvalidKind` | The existing storage account of the `BlobBlobStorage` or `BlobStorage` type doesn't support file shares and can't be used. |
411412
| `DeploymentScriptStorageAccountInvalidKindAndSku` | The existing storage account doesn't support file shares. For a list of supported types of storage accounts, see [Use an existing storage account](./deployment-script-develop.md#use-an-existing-storage-account). |
412413
| `DeploymentScriptStorageAccountNotFound` | The storage account doesn't exist, or an external process or tool deleted it. |

articles/container-apps/tutorial-ci-cd-runners-jobs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ You can now create a job that uses to use the container image. In this section,
406406
--cpu "2.0" \
407407
--memory "4Gi" \
408408
--secrets "personal-access-token=$GITHUB_PAT" \
409-
--env-vars "GITHUB_PAT=secretref:personal-access-token" "REPO_URL=https://github.com/$REPO_OWNER/$REPO_NAME" "REGISTRATION_TOKEN_API_URL=https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/actions/runners/registration-token" \
409+
--env-vars "GITHUB_PAT=secretref:personal-access-token" "GH_URL=https://github.com/$REPO_OWNER/$REPO_NAME" "REGISTRATION_TOKEN_API_URL=https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/actions/runners/registration-token" \
410410
--registry-server "$CONTAINER_REGISTRY_NAME.azurecr.io"
411411
```
412412
@@ -429,7 +429,7 @@ You can now create a job that uses to use the container image. In this section,
429429
--cpu "2.0" `
430430
--memory "4Gi" `
431431
--secrets "personal-access-token=$GITHUB_PAT" `
432-
--env-vars "GITHUB_PAT=secretref:personal-access-token" "REPO_URL=https://github.com/$REPO_OWNER/$REPO_NAME" "REGISTRATION_TOKEN_API_URL=https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/actions/runners/registration-token" `
432+
--env-vars "GITHUB_PAT=secretref:personal-access-token" "GH_URL=https://github.com/$REPO_OWNER/$REPO_NAME" "REGISTRATION_TOKEN_API_URL=https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/actions/runners/registration-token" `
433433
--registry-server "$CONTAINER_REGISTRY_NAME.azurecr.io"
434434
```
435435

articles/databox/data-box-hardware-additional-terms.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ All right, title and interest in each Data Box Device is and shall remain the pr
2929

3030
### Fees
3131

32-
Microsoft may charge Customer specified fees in connection with its use of the Data Box Device as part of the Service, as described at https://go.microsoft.com/fwlink/?linkid=2052173. For clarity, Azure Storage and Azure IoT Hub are separate Azure Services, and if used (even in connection with its use of the Service), separate Azure metered fees will apply. Additional Azure services Customer uses after completing a transfer of data using the Azure Data Box Service are also subject to separate usage fees. For Data Box Devices, Microsoft may charge Customer a lost device fee, as provided in Table 1 below, if (i) the Data Box Device is lost or materially damaged while it is in Customer’s care; and/or (ii) Customer does not provide the Data Box Device to the Microsoft-designated carrier for return within the time period after the date it was delivered to Customer as provided in Table 1 below. Microsoft reserves the right to change the fees charged for Data Box Device types, including charging different amounts for different device form factors.
32+
Microsoft may charge Customer specified fees in connection with its use of the Data Box Device as part of the Service, as described at https://go.microsoft.com/fwlink/?linkid=2052173. For clarity, Azure Storage and Azure IoT Hub are separate Azure Services, and if used (even in connection with its use of the Service), separate Azure metered fees will apply. Additional Azure services Customer uses after completing a transfer of data using the Azure Data Box Service are also subject to separate usage fees. For Data Box Devices, Microsoft may charge Customer a lost device fee, as provided in Table 1 below, if the Data Box Device is lost or materially damaged while it is in Customer’s care. Microsoft reserves the right to change the fees charged for Data Box Device types, including charging different amounts for different device form factors.
3333

3434
Table 1:
3535

3636
|Data Box Device type | Lost or Materially Damaged Time Period and Amounts|
3737
|---------|---------|
38-
|Data Box | Period: After 90 days<br> Amount: $40,000.00 USD |
39-
|Data Box Disk | Period: After 90 days<br> Amount: $2,500.00 USD |
40-
|Data Box Heavy | Period: After 90 days<br> Amount: $250,000.00 USD |
38+
|Data Box | Amount: $40,000.00 USD |
39+
|Data Box Disk | Amount: $2,500.00 USD |
40+
|Data Box Heavy | Amount: $250,000.00 USD |
4141
|Data Box Gateway | N/A |
4242

4343
### Shipment and Return of Data Box Device
@@ -61,4 +61,4 @@ If Customer wishes to move a Data Box Device to another country/region, then Cus
6161
## Next steps
6262

6363
- [Azure Data Box](data-box-overview.md)
64-
- [Azure Data Box pricing](https://azure.microsoft.com/pricing/details/databox/)
64+
- [Azure Data Box pricing](https://azure.microsoft.com/pricing/details/databox/)

0 commit comments

Comments
 (0)