Skip to content

Commit 78c07ef

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into edgioretire
2 parents 938b7d1 + 1001b60 commit 78c07ef

File tree

453 files changed

+1887
-1437
lines changed

Some content is hidden

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

453 files changed

+1887
-1437
lines changed

articles/app-service/overview-vnet-integration.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@ Because subnet size can't be changed after assignment, use a subnet that's large
7676

7777
With multi plan subnet join (MPSJ), you can join multiple App Service plans in to the same subnet. All App Service plans must be in the same subscription but the virtual network/subnet can be in a different subscription. Each instance from each App Service plan requires an IP address from the subnet and to use MPSJ a minimum size of `/26` subnet is required. If you plan to join many and/or large scale plans, you should plan for larger subnet ranges.
7878

79-
>[!NOTE]
80-
> Multi plan subnet join is currently in public preview. During preview the following known limitations should be observed:
81-
>
82-
> * The minimum requirement for subnet size of `/26` is currently not enforced, but will be enforced at GA. If you have joined multiple plans to a smaller subnet during preview they will still work, but you cannot connect additional plans and if you disconnect you will not be able to connect again.
83-
> * There is currently no validation if the subnet has available IPs, so you might be able to join N+1 plan, but the instances will not get an IP. You can view available IPs in the Virtual network integration page in Azure portal in apps that are already connected to the subnet.
84-
8579
### Windows Containers specific limits
8680

8781
Windows Containers uses an extra IP address per app for each App Service plan instance, and you need to size the subnet accordingly. If you have, for example, 10 Windows Container App Service plan instances with four apps running, you need 50 IP addresses and extra addresses to support horizontal (in/out) scale.

articles/automation/shared-resources/variables.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ from automationassets import AutomationAssetNotFound
196196

197197
# get a variable
198198
value = automationassets.get_automation_variable("test-variable")
199-
print value
199+
print(value)
200200

201201
# set a variable (value can be int/bool/string)
202202
automationassets.set_automation_variable("test-variable", True)
@@ -207,7 +207,7 @@ automationassets.set_automation_variable("test-variable", "test-string")
207207
try:
208208
value = automationassets.get_automation_variable("nonexisting variable")
209209
except AutomationAssetNotFound:
210-
print ("variable not found")
210+
print("variable not found")
211211
```
212212

213213
---

articles/azure-cache-for-redis/cache-remove-tls-10-11.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ ms.devlang: csharp
1313

1414
# Remove TLS 1.0 and 1.1 from use with Azure Cache for Redis
1515

16-
To meet the industry-wide push toward the exclusive use of Transport Layer Security (TLS) version 1.2 or later, Azure Cache for Redis is moving toward requiring the use of the TLS 1.2 in November 2024. TLS versions 1.0 and 1.1 are known to be susceptible to attacks such as BEAST and POODLE, and to have other Common Vulnerabilities and Exposures (CVE) weaknesses.
16+
To meet the industry-wide push toward the exclusive use of Transport Layer Security (TLS) version 1.2 or later, Azure Cache for Redis is moving toward requiring the use of the TLS 1.2 in March 2025. TLS versions 1.0 and 1.1 are known to be susceptible to attacks such as BEAST and POODLE, and to have other Common Vulnerabilities and Exposures (CVE) weaknesses.
1717

1818
TLS versions 1.0 and 1.1 also don't support the modern encryption methods and cipher suites recommended by Payment Card Industry (PCI) compliance standards. This [TLS security blog](https://www.acunetix.com/blog/articles/tls-vulnerabilities-attacks-final-part/) explains some of these vulnerabilities in more detail.
1919

2020
> [!IMPORTANT]
21-
> Starting November 1, 2024, the TLS 1.2 requirement will be enforced.
21+
> Starting March 1, 2025, the TLS 1.2 requirement will be enforced.
2222
>
2323
>
2424
@@ -29,14 +29,14 @@ TLS versions 1.0 and 1.1 also don't support the modern encryption methods and ci
2929
As a part of this effort, you can expect the following changes to Azure Cache for Redis:
3030

3131
- _Phase 1_: Azure Cache for Redis stops offering TLS 1.0/1.1 as an option for _MinimumTLSVersion_ setting for new cache creates. Existing cache instances won't be updated at this point. You can't set the _MinimumTLSVersion_ to 1.0 or 1.1 for your existing cache.
32-
- _Phase 2_: Azure Cache for Redis stops supporting TLS 1.1 and TLS 1.0 starting November 1, 2024. After this change, your application must use TLS 1.2 or later to communicate with your cache. The Azure Cache for Redis service remains available while we update the _MinimumTLSVerion_ for all caches to 1.2.
32+
- _Phase 2_: Azure Cache for Redis stops supporting TLS 1.1 and TLS 1.0 starting March 1, 2025. After this change, your application must use TLS 1.2 or later to communicate with your cache. The Azure Cache for Redis service remains available while we update the _MinimumTLSVerion_ for all caches to 1.2.
3333

3434
| Date | Description |
3535
| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
3636
| September 2023 | TLS 1.0/1.1 retirement announcement |
3737
| March 1, 2024 | Beginning March 1, 2024, you can't create new caches with the Minimum TLS version set to 1.0 or 1.1 and you can't set the _MinimumTLSVersion_ to 1.0 or 1.1 for your existing cache. The minimum TLS version won't be updated automatically for existing caches at this point. |
3838
| October 31, 2024 | Ensure that all your applications are connecting to Azure Cache for Redis using TLS 1.2 and Minimum TLS version on your cache settings is set to 1.2. |
39-
| Starting November 1, 2024 | Minimum TLS version for all cache instances is updated to 1.2. This means Azure Cache for Redis instances reject connections using TLS 1.0 or 1.1 at this point. |
39+
| Starting March 1, 2025 | Minimum TLS version for all cache instances is updated to 1.2. This means Azure Cache for Redis instances reject connections using TLS 1.0 or 1.1 at this point. |
4040

4141
> [!IMPORTANT]
4242
> The content in this article does not apply to Azure Cache for Redis Enterprise/Enterprise Flash because the Enterprise tiers only support TLS 1.2.
Binary file not shown.
Binary file not shown.
20 KB
Loading
14.7 KB
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)