Skip to content

Commit 4e8c7e5

Browse files
Merge branch 'main' into Release_Archive_main_2024-12-12-15-18-21
2 parents 1acdef5 + 3901586 commit 4e8c7e5

File tree

5 files changed

+11
-191
lines changed

5 files changed

+11
-191
lines changed

.openpublishing.redirection.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@
2424
"source_path": "articles/operator-call-protection/set-up-operator-call-protection.md",
2525
"redirect_url": "/previous-versions/azure/operator-call-protection/set-up-operator-call-protection",
2626
},
27+
{
28+
"source_path": "articles/private-multi-access-edge-compute-mec/overview.md",
29+
"redirect_url": "/previous-versions/azure/private-multi-access-edge-compute-mec/overview",
30+
"redirect_document_id": false
31+
},
32+
{
33+
"source_path": "articles/private-multi-access-edge-compute-mec/partner-programs.md",
34+
"redirect_url": "/previous-versions/azure/private-multi-access-edge-compute-mec/partner-programs",
35+
},
2736
{
2837
"source_path": "articles/time-series-insights/breaking-changes-long-data-type.md",
2938
"redirect_url": "/previous-versions/azure/time-series-insights/breaking-changes-long-data-type",

articles/backup/backup-azure-enhanced-soft-delete-about.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Overview of enhanced soft delete for Azure Backup
33
description: This article gives an overview of enhanced soft delete for Azure Backup.
44
ms.topic: overview
55
ms.custom: references_regions
6-
ms.date: 12/13/2024
6+
ms.date: 12/18/2024
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
99
ms.author: v-abhmallick
@@ -42,7 +42,7 @@ The key benefits of enhanced soft delete are:
4242
>The soft delete doesn't cost you for 14 days of retention; however, you're charged for the period beyond 14 days. [Learn more](#pricing).
4343
- **Re-registration of soft deleted items**: You can now register the items in soft deleted state with another vault. However, you can't register the same item with two vaults for active backups.
4444
- **Soft delete and reregistration of backup containers**: You can now unregister the backup containers (which you can soft delete) if you've deleted all backup items in the container. You can now register such soft deleted containers to other vaults. This is applicable for applicable workloads only, including SQL in Azure VM backup, SAP HANA in Azure VM backup and backup of on-premises servers. [Learn more](#soft-deleted-items-reregistration).
45-
- **Soft delete across workloads**: Enhanced soft delete applies to all vaulted datasources alike and is supported for Recovery Services vaults and Backup vaults. Enhanced soft delete also applies to operational backups of disks and VM backup snapshots used for instant restores. However, unlike vaulted backups, these snapshots can be directly accessed and deleted before the soft delete period expires. Enhanced soft delete is currently not supported for operational backup for Blobs and Azure Files.
45+
- **Soft delete across workloads**: Enhanced soft delete applies to all vaulted datasources alike and is supported for Recovery Services vaults and Backup vaults. Enhanced soft delete also applies to operational backups of disks, Blobs, Azure Files and VM backup snapshots used for instant restores. However, unlike vaulted backups, these snapshots can be directly accessed and deleted before the soft delete period expires.
4646
- **Soft delete of recovery points**: This feature allows you to recover data from recovery points that might have been deleted due to making changes in a backup policy or changing the backup policy associated with a backup item. Soft delete of recovery points isn't supported for log recovery points in SQL and SAP HANA workloads. [Learn more](manage-recovery-points.md#impact-of-expired-recovery-points-for-items-in-soft-deleted-state).
4747

4848
## Supported scenarios

articles/private-multi-access-edge-compute-mec/TOC.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
items:
44
- name: Overview
55
expanded: true
6-
items:
7-
- name: What is the Azure private MEC?
8-
href: overview.md
9-
- name: Azure Private MEC partner solutions
10-
href: partner-programs.md
116
- name: Related
127
items:
138
- name: Azure Network Function Manager
@@ -26,6 +21,3 @@
2621
href: https://azure.microsoft.com/roadmap/?category=networking
2722
- name: Blog
2823
href: https://azure.microsoft.com/blog/topics/networking
29-
30-
31-

articles/private-multi-access-edge-compute-mec/overview.md

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)