Skip to content

Commit bf2ced6

Browse files
authored
Merge pull request #280934 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 d3acab3 + c49c58e commit bf2ced6

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

articles/azure-cache-for-redis/cache-how-to-zone-redundancy.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ In this article, you'll learn how to configure a zone-redundant Azure Cache inst
1515

1616
Azure Cache for Redis Standard, Premium, and Enterprise tiers provide built-in redundancy by hosting each cache on two dedicated virtual machines (VMs). Even though these VMs are located in separate [Azure fault and update domains](../virtual-machines/availability.md) and highly available, they're susceptible to datacenter level failures. Azure Cache for Redis also supports zone redundancy in its Premium and Enterprise tiers. A zone-redundant cache runs on VMs spread across multiple [Availability Zones](../reliability/availability-zones-overview.md). It provides higher resilience and availability.
1717

18-
> [!NOTE]
19-
> Data transfer between Azure Availability Zones will be charged at standard [bandwidth rates](https://azure.microsoft.com/pricing/details/bandwidth/).
20-
2118
## Prerequisites
2219

2320
- Azure subscription - [create one for free](https://azure.microsoft.com/free/)

articles/azure-monitor/alerts/alerts-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ This table provides a brief description of each alert type. For more information
5959

6060
Alerts can be stateful or stateless.
6161
- Stateless alerts fire each time the condition is met, even if fired previously.
62-
- Stateful alerts fire when the rule conditions are met, and will not fire again or trigger any more actions until the conditions are resolved.
62+
- Stateful alerts fire when the rule conditions are met, and will not fire again or trigger any more actions until the conditions are resolved.
63+
64+
Each alert rule is evaluated individually. There is no validation to check if there is another alert configured for the same conditions. If there is more than one alert rule configured for the same conditions, each of those alerts will fire when the conditions are met.
6365

6466
Alerts are stored for 30 days and are deleted after the 30-day retention period.
6567

articles/oracle/oracle-db/database-overview.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ Oracle Database@Azure is available in the following locations. Oracle Database@A
4646

4747
|Azure region|Oracle Exadata Database@Azure|Oracle Autonomous Database@Azure|
4848
|-------------------------|:-------------:|:--------------:|
49-
|East US (Virginia)|✓ | ✓|
50-
|Germany West Central (Frankfurt)| ✓|✓ |
51-
|France Central (Paris)|✓ | |
52-
|UK South (London)|✓ |✓ |
49+
|East US |✓ | ✓|
50+
|Germany West Central | ✓|✓ |
51+
|France Central |✓ | |
52+
|UK South |✓ |✓ |
53+
|Canada Central |✓ |✓ |
5354

5455

5556

0 commit comments

Comments
 (0)