Skip to content

Commit 15be9ff

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into linux-fixes-1
2 parents 250c9db + e075579 commit 15be9ff

File tree

3 files changed

+26
-29
lines changed

3 files changed

+26
-29
lines changed

articles/storage/blobs/storage-retry-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The following table lists the properties of the [RetryOptions](/dotnet/api/azure
2525
| --- | --- | --- | --- |
2626
| [Delay](/dotnet/api/azure.core.retryoptions.delay) | [TimeSpan](/dotnet/api/system.timespan) | The delay between retry attempts for a fixed approach or the delay on which to base calculations for a backoff-based approach. If the service provides a Retry-After response header, the next retry will be delayed by the duration specified by the header value. | 0.8 second |
2727
| [MaxDelay](/dotnet/api/azure.core.retryoptions.maxdelay) | [TimeSpan](/dotnet/api/system.timespan) | The maximum permissible delay between retry attempts when the service doesn't provide a Retry-After response header. If the service provides a Retry-After response header, the next retry will be delayed by the duration specified by the header value. | 1 minute |
28-
| [MaxRetries](/dotnet/api/azure.core.retryoptions.maxretries) | int | The maximum number of retry attempts before giving up. | 3 |
28+
| [MaxRetries](/dotnet/api/azure.core.retryoptions.maxretries) | int | The maximum number of retry attempts before giving up. | 5 |
2929
| [Mode](/dotnet/api/azure.core.retryoptions.mode) | [RetryMode](/dotnet/api/azure.core.retrymode) | The approach to use for calculating retry delays. | Exponential |
3030
| [NetworkTimeout](/dotnet/api/azure.core.retryoptions.networktimeout) | [TimeSpan](/dotnet/api/system.timespan) | The timeout applied to an individual network operation. | 100 seconds |
3131

articles/virtual-machine-scale-sets/quick-create-portal.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ author: ju-shim
55
ms.author: jushiman
66
ms.topic: quickstart
77
ms.service: virtual-machine-scale-sets
8-
ms.date: 11/22/2022
9-
ms.reviewer: mimckitt
8+
ms.date: 04/18/2023
9+
ms.reviewer: mimckitt, mattmcinnes
1010
ms.custom: mimckitt, mode-ui
1111
---
1212

@@ -17,7 +17,7 @@ ms.custom: mimckitt, mode-ui
1717
> [!NOTE]
1818
> The following article is for Uniform Virtual Machine Scale Sets. We recommend using Flexible Virtual Machine Scale Sets for new workloads. Learn more about this new orchestration mode in our [Flexible Virtual Machine Scale Sets overview](flexible-virtual-machine-scale-sets.md).
1919
20-
A Virtual Machine Scale Set allows you to deploy and manage a set of auto-scaling virtual machines. You can scale the number of VMs in the scale set manually, or define rules to autoscale based on resource usage like CPU, memory demand, or network traffic. An Azure load balancer then distributes traffic to the VM instances in the scale set. In this quickstart, you create a Virtual Machine Scale Set in the Azure portal.
20+
A Virtual Machine Scale Set allows you to deploy and manage a set of autoscaling virtual machines. You can scale the number of VMs in the scale set manually, or define rules to autoscale based on resource usage like CPU, memory demand, or network traffic. An Azure load balancer then distributes traffic to the VM instances in the scale set. In this quickstart, you create a Virtual Machine Scale Set in the Azure portal.
2121

2222
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2323

@@ -47,15 +47,15 @@ First, create a public Standard Load Balancer by using the portal. The name and
4747
| Assignment| Static |
4848
| Availability zone | Select **Zone-redundant**. |
4949

50-
1. When you are done, select **Review + create**
50+
1. When you're done, select **Review + create**
5151
1. After it passes validation, select **Create**.
5252

5353
![Create a load balancer](./media/virtual-machine-scale-sets-create-portal/load-balancer.png)
5454

5555
## Create Virtual Machine Scale Set
5656
You can deploy a scale set with a Windows Server image or Linux image such as RHEL, CentOS, Ubuntu, or SLES.
5757

58-
1. Type **Scale set** in the search box. In the results, under **Marketplace**, select **Virtual Machine Scale Sets**. Select **Create** on the **Virtual Machine Scale Sets** page, which will open the **Create a Virtual Machine Scale Set** page.
58+
1. Type **Scale set** in the search box. In the results, under **Marketplace**, select **Virtual Machine Scale Sets**. Select **Create** on the **Virtual Machine Scale Sets** page, which opens the **Create a Virtual Machine Scale Set** page.
5959
1. In the **Basics** tab, under **Project details**, make sure the correct subscription is selected and select *myVMSSResourceGroup* from resource group list.
6060
1. Type *myScaleSet* as the name for your scale set.
6161
1. In **Region**, select a region that is close to your area.
@@ -67,13 +67,13 @@ You can deploy a scale set with a Windows Server image or Linux image such as RH
6767

6868
:::image type="content" source="./media/virtual-machine-scale-sets-create-portal/quick-create-scale-set.png" alt-text="Image shows create options for scale sets in the Azure portal.":::
6969

70-
1. Select **Next** to move the the other pages.
70+
1. Select **Next** to move the other pages.
7171
1. Leave the defaults for the **Disks** page.
7272
1. On the **Networking** page, under **Load balancing**, select the **Use a load balancer** option to put the scale set instances behind a load balancer.
7373
1. In **Load balancing options**, select **Azure load balancer**.
7474
1. In **Select a load balancer**, select *myLoadBalancer* that you created earlier.
7575
1. For **Select a backend pool**, select **Create new**, type *myBackendPool*, then select **Create**.
76-
1. When you are done, select **Review + create**.
76+
1. When you're done, select **Review + create**.
7777
1. After it passes validation, select **Create** to deploy the scale set.
7878

7979

0 commit comments

Comments
 (0)