Skip to content

Commit f349b6f

Browse files
authored
Merge pull request #96551 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 5b51d4c + 45e85c8 commit f349b6f

File tree

5 files changed

+15
-2
lines changed

5 files changed

+15
-2
lines changed

articles/active-directory/develop/v2-permissions-and-consent.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ The Microsoft identity platform implements the [OAuth 2.0](active-directory-v2-p
3838
* Microsoft Graph: `https://graph.microsoft.com`
3939
* Office 365 Mail API: `https://outlook.office.com`
4040
* Azure AD Graph: `https://graph.windows.net`
41+
* Azure Key Vault: `https://vault.azure.net`
4142

4243
> [!NOTE]
4344
> We strongly recommend that you use Microsoft Graph instead of Azure AD Graph, Office 365 Mail API, etc.

articles/azure-functions/functions-compare-logic-apps-ms-flow-webjobs.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ Functions and Logic Apps are Azure services that enable serverless workloads. Az
4444

4545
For Azure Functions, you develop orchestrations by writing code and using the [Durable Functions extension](durable/durable-functions-overview.md). For Logic Apps, you create orchestrations by using a GUI or editing configuration files.
4646

47-
You can mix and match services when you build an orchestration, calling functions from logic apps and calling logic apps from functions. Choose how to build each orchestration based on the services' capabilities or your personal preference. The following table lists some of the key differences between these
47+
You can mix and match services when you build an orchestration, calling functions from logic apps and calling logic apps from functions. Choose how to build each orchestration based on the services' capabilities or your personal preference. The following table lists some of the key differences between these:
48+
4849
| | Durable Functions | Logic Apps |
4950
| --- | --- | --- |
5051
| Development | Code-first (imperative) | Designer-first (declarative) |

articles/container-registry/container-registry-faq.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ Image quarantine is currently a preview feature of ACR. You can enable the quara
253253
- [Check health with `az acr check-health`](#check-health-with-az-acr-check-health)
254254
- [docker pull fails with error: net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers)](#docker-pull-fails-with-error-nethttp-request-canceled-while-waiting-for-connection-clienttimeout-exceeded-while-awaiting-headers)
255255
- [docker push succeeds but docker pull fails with error: unauthorized: authentication required](#docker-push-succeeds-but-docker-pull-fails-with-error-unauthorized-authentication-required)
256+
- [`az acr login` succeeds, but docker commands fails with error: unauthorized: authentication required](#az-acr-login-succeeds-but-docker-fails-with-error-unauthorized-authentication-required)
256257
- [Enable and get the debug logs of the docker daemon](#enable-and-get-the-debug-logs-of-the-docker-daemon)
257258
- [New user permissions may not be effective immediately after updating](#new-user-permissions-may-not-be-effective-immediately-after-updating)
258259
- [Authentication information is not given in the correct format on direct REST API calls](#authentication-information-is-not-given-in-the-correct-format-on-direct-rest-api-calls)
@@ -317,6 +318,10 @@ To resolve the error:
317318

318319
Details of `--signature-verification` can be found by running `man dockerd`.
319320

321+
### az acr login succeeds but docker fails with error: unauthorized: authentication required
322+
323+
Make sure you use an all lowercase server URL, for example, `docker push myregistry.azurecr.io/myimage:latest`, even if the registry resource name is uppercase or mixed case, like `myRegistry`.
324+
320325
### Enable and get the debug logs of the Docker daemon
321326

322327
Start `dockerd` with the `debug` option. First, create the Docker daemon configuration file (`/etc/docker/daemon.json`) if it doesn't exist, and add the `debug` option:

articles/key-vault/quick-create-net.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Add the following directives to the top of your code:
153153

154154
### Authenticate and create a client
155155

156-
Authenticating to your key vault and creating a key vault client depends on the environmental variables in the [Set environmental variables](#set-environmental-variables) step above. The name of your key vault is expanded to the key vault URI, in the format "https://<your-key-vault-name>.vault.azure.net".
156+
Authenticating to your key vault and creating a key vault client depends on the environmental variables in the [Set environmental variables](#set-environmental-variables) step above. The name of your key vault is expanded to the key vault URI, in the format "https://\<your-key-vault-name\>.vault.azure.net".
157157

158158
[!code-csharp[Directives](~/samples-key-vault-dotnet-quickstart/key-vault-console-app/Program.cs?name=authenticate)]
159159

articles/storage/blobs/storage-blob-performance-tiers.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ Premium performance storage is ideal for workloads that require fast and consist
5151

5252
Standard performance supports different [access tiers](storage-blob-storage-tiers.md) to store data in the most cost-effective manner. It's optimized for high capacity and high throughput on large data sets.
5353

54+
- **Backup and disaster recovery datasets**. Standard performance storage offers cost-efficient tiers, making it a perfect use case for both short-term and long-term disaster recovery datasets, secondary backups, and compliance data archiving.
55+
56+
- **Media content**. Images and videos often are accessed frequently when first created and stored, but this content type is used less often as it gets older. Standard performance storage offers suitable tiers for media content needs.
57+
58+
- **Bulk data processing**. These kinds of workloads are suitable for standard storage because they require cost-effective high-throughput storage instead of consistent low latency. Large, raw datasets are staged for processing and eventually migrate to cooler tiers.
59+
5460
## Migrate from standard to premium
5561

5662
You can't convert an existing standard performance storage account to a block blob storage account with premium performance. To migrate to a premium performance storage account, you must create a BlockBlobStorage account, and migrate the data to the new account. For more information, see [Create a BlockBlobStorage account](storage-blob-create-account-block-blob.md).

0 commit comments

Comments
 (0)