Skip to content

Commit 61a34ea

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into files-dev-docs
2 parents 7fa3854 + db7b7cc commit 61a34ea

File tree

201 files changed

+7207
-4794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+7207
-4794
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,6 +2819,11 @@
28192819
"redirect_url": "/azure/bastion/bastion-connect-vm-ssh-linux",
28202820
"redirect_document_id": false
28212821
},
2822+
{
2823+
"source_path_from_root": "/articles/bastion/quickstart-developer-sku.md",
2824+
"redirect_url": "/azure/bastion/quickstart-developer",
2825+
"redirect_document_id": false
2826+
},
28222827
{
28232828
"source_path_from_root": "/articles/bastion/bastion-connect-vm-rdp.md",
28242829
"redirect_url": "/azure/bastion/bastion-connect-vm-rdp-windows",
@@ -6289,6 +6294,11 @@
62896294
"redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
62906295
"redirect_document_id": false
62916296
},
6297+
{
6298+
"source_path_from_root": "/articles/cyclecloud/how-to/ccws/cleanup-roles.md",
6299+
"redirect_url": "/azure/cyclecloud/how-to/ccws/deploy-with-cli",
6300+
"redirect_document_id": false
6301+
},
62926302
{
62936303
"source_path": "articles/cloud-services/applications-dont-support-tls-1-2.md",
62946304
"redirect_url": "/previous-versions/azure/cloud-services/applications-dont-support-tls-1-2",

articles/api-center/enable-platform-api-catalog-vscode-extension.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ First, configure an app registration in your Microsoft Entra ID tenant. The app
6060
1. On the **Configure platforms** page, select **Mobile and desktop applications**.
6161
1. On the **Configure Desktop + devices** page, enter the following redirect URI and select **Configure**:
6262

63-
`https://vscode.dev/redirect`
64-
63+
`https://vscode.dev/redirect` , `http://localhost` and `ms-appx-web://Microsoft.AAD.BrokerPlugin/<application-client-id>`
64+
6565
1. In the left menu, under **Manage**, select **API permissions** > **+ Add a permission**.
6666
1. On the **Request API permissions** page, do the following:
6767
1. Select the **APIs my organization uses** tab.

articles/app-service/configure-language-java-deploy-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ See respective sections below for details as well as opportunities to customize
549549
- The Keystore of the Java runtime is updated with any public and private certificates defined in Azure portal.
550550
- Public certificates are provided by the platform in the */var/ssl/certs* directory, and they're loaded to *$JRE_HOME/lib/security/cacerts*.
551551
- Private certificates are provided by the platform in the */var/ssl/private* directory, and they're loaded to *$JRE_HOME/lib/security/client.jks*.
552-
- If any certificates are loaded in the Java keystore in this step, the properties `javax.net.ssl.keyStore`, `javax.net.ssl.keyStorePassword` and `javax.net.ssl.keyStoreType` are added to the `JAVA_TOOL_OPTIONS` environment variable.
552+
- If any certificates are loaded in the Java keystore in this step, the properties `javax.net.ssl.keyStore`, `javax.net.ssl.keyStorePassword` and `javax.net.ssl.keyStoreType` are added to the `JAVA_OPTS` environment variable.
553553
- Some initial JVM configuration is determined such as logging directories and Java memory heap parameters:
554554
- If you provide the `–Xms` or `–Xmx` flags for memory in the app setting `JAVA_OPTS`, these values override the ones provided by the platform.
555555
- If you configure the app setting `WEBSITES_CONTAINER_STOP_TIME_LIMIT`, the value is passed to the runtime property `org.wildfly.sigterm.suspend.timeout`, which controls the maximum shutdown wait time (in seconds) when JBoss is being stopped.

articles/application-gateway/for-containers/alb-controller-release-notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ Instructions for new or existing deployments of ALB Controller are found in the
2626

2727
| ALB Controller Version | Gateway API Version | Kubernetes Version | Release Notes |
2828
| ---------------------- | ------------------- | ------------------ | ------------- |
29-
| 1.4.12 | v1.1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Updated to Gateway API version 1.1.1, Regex match support for path and header match in HTTP and GRPC routes, [Wildcard hostname fix](https://github.com/Azure/AKS/issues/4713), Misc. bug fixes and improvements |
30-
29+
| 1.4.14 | v1.1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Bug fixes, including [issue #4086](https://github.com/Azure/AKS/issues/4086) |
3130
## Release history
3231

3332
| ALB Controller Version | Gateway API Version | Kubernetes Version | Release Notes |
3433
| ---------------------- | ------------------- | ------------------ | ------------- |
34+
| 1.4.12 | v1.1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Updated to Gateway API version 1.1.1, Regex match support for path and header match in HTTP and GRPC routes, [Wildcard hostname fix](https://github.com/Azure/AKS/issues/4713), Misc. bug fixes and improvements |
3535
| 1.3.7| v1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Minor fixes and improvements |
3636
| 1.2.3| v1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Gateway API v1.1, gRPC support, frontend mutual authentication, readiness probe fixes, custom health probe port and TLS mode |
3737
| 1.0.2| v1 | v1.26, v1.27, v1.28, v1.29 | ECDSA + RSA certificate support for both Ingress and Gateway API, Ingress fixes, Server-sent events support |

articles/application-gateway/for-containers/quickstart-deploy-application-gateway-for-containers-alb-controller.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ You need to complete the following tasks before deploying Application Gateway fo
146146
az aks get-credentials --resource-group $RESOURCE_GROUP --name $AKS_NAME
147147
helm install alb-controller oci://mcr.microsoft.com/application-lb/charts/alb-controller \
148148
--namespace $HELM_NAMESPACE \
149-
--version 1.4.12 \
149+
--version 1.4.14 \
150150
--set albController.namespace=$CONTROLLER_NAMESPACE \
151151
--set albController.podIdentity.clientID=$(az identity show -g $RESOURCE_GROUP -n azure-alb-identity --query clientId -o tsv)
152152
```
@@ -164,7 +164,7 @@ You need to complete the following tasks before deploying Application Gateway fo
164164
az aks get-credentials --resource-group $RESOURCE_GROUP --name $AKS_NAME
165165
helm upgrade alb-controller oci://mcr.microsoft.com/application-lb/charts/alb-controller \
166166
--namespace $HELM_NAMESPACE \
167-
--version 1.4.12 \
167+
--version 1.4.14 \
168168
--set albController.namespace=$CONTROLLER_NAMESPACE \
169169
--set albController.podIdentity.clientID=$(az identity show -g $RESOURCE_GROUP -n azure-alb-identity --query clientId -o tsv)
170170
```

articles/application-gateway/for-containers/troubleshooting-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ Example output:
2525

2626
| NAME | READY | UP-TO-DATE | AVAILABLE | AGE | CONTAINERS | IMAGES | SELECTOR |
2727
| ------------------------ | ----- | ---------- | --------- | ---- | ----------------------- | ------------------------------------------------------------------------------- | -------- |
28-
| alb-controller | 2/2 | 2 | 2 | 18d | alb-controller | mcr.microsoft.com/application-lb/images/alb-controller:**1.4.12** | app=alb-controller |
29-
| alb-controller-bootstrap | 1/1 | 1 | 1 | 18d | alb-controller-bootstrap | mcr.microsoft.com/application-lb/images/alb-controller-bootstrap:**1.4.12** | app=alb-controller-bootstrap |
28+
| alb-controller | 2/2 | 2 | 2 | 18d | alb-controller | mcr.microsoft.com/application-lb/images/alb-controller:**1.4.14** | app=alb-controller |
29+
| alb-controller-bootstrap | 1/1 | 1 | 1 | 18d | alb-controller-bootstrap | mcr.microsoft.com/application-lb/images/alb-controller-bootstrap:**1.4.14** | app=alb-controller-bootstrap |
3030

31-
In this example, the ALB controller version is **1.4.12**.
31+
In this example, the ALB controller version is **1.4.14**.
3232

3333
The ALB Controller version can be upgraded by running the `helm upgrade alb-controller` command. For more information, see [Install the ALB Controller](quickstart-deploy-application-gateway-for-containers-alb-controller.md#install-the-alb-controller).
3434

articles/automation/automation-use-azure-ad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Before installing the Microsoft Entra modules on your computer:
4141
4242
1. Install Windows Management Framework (WMF) 5.1. See [Install and Configure WMF 5.1](/powershell/scripting/wmf/setup/install-configure).
4343

44-
2. Install AzureRM and/or Az using instructions in [Install Azure PowerShell on Windows with PowerShellGet](/powershell/azure/azurerm/install-azurerm-ps).
44+
2. Install AzureRM and/or Az using instructions in [Install Azure PowerShell on Windows with PowerShellGet](/powershell/azure/install-azure-powershell).
4545

4646
### Install the MSOnline module
4747

articles/azure-cache-for-redis/cache-migration-guide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ description: Learn how to migrate your existing cache to Azure Cache for Redis
77
ms.topic: conceptual
88
ms.custom:
99
- ignite-2024
10+
- migration
11+
- aws-to-azure
1012
ms.date: 11/17/2021
1113
---
1214
# Migrate to Azure Cache for Redis

articles/azure-functions/functions-create-your-first-function-visual-studio.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ Your function definition should now look like the following code:
7777

7878
```csharp
7979
[Function("HttpExample")]
80-
public IActionResult Run([HttpTrigger(AuthorizationLevel.AuthLevelValue, "get", "post")] HttpRequest req)
80+
public IActionResult Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] HttpRequest req)
8181
{
82-
return new OkObjectResult("Welcome to Azure Functions!");
82+
return new OkObjectResult("Hello, functions");
8383
}
8484
```
8585

articles/azure-functions/functions-infrastructure-as-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This article shows you how to automate the creation of resources and deployment
2020

2121
The template code required depends on the desired hosting options for your function app. This article supports the following hosting options:
2222

23-
| Hosting option | Deployment type | To learn more, see... |
23+
| Hosting option | Deployment type | Sample template |
2424
| ----- | ----- | ----- |
2525
| [Azure Functions Consumption plan](functions-infrastructure-as-code.md?pivots=consumption-plan) | Code-only | [Consumption plan](./consumption-plan.md) |
2626
| [Azure Functions Flex Consumption plan](functions-infrastructure-as-code.md?pivots=consumption-plan) | Code-only | [Flex Consumption plan](./flex-consumption-plan.md) |

0 commit comments

Comments
 (0)