Skip to content

Commit 11df93f

Browse files
authored
Merge pull request #211231 from markingmyname/revert-210905-vivek
Revert "[MySQL] New Customer Managed Key article"
2 parents 614f553 + ae80eb7 commit 11df93f

File tree

4 files changed

+1
-133
lines changed

4 files changed

+1
-133
lines changed

articles/key-vault/general/soft-delete-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Upon deleting a key vault, the service creates a proxy resource under the subscr
6969

7070
### Key vault object recovery
7171

72-
Upon deleting a key vault object, such as a key, the service will place the object in a deleted state, making it inaccessible to any retrieval operations. While in this state, the key vault object can only be listed, recovered, or forcefully/permanently deleted. To view the objects, use the Azure CLI `az keyvault key list-deleted` command (as documented in [How to use Key Vault soft-delete with CLI](./key-vault-recovery.md)), or the Azure PowerShell `Get-AzKeyVault -InRemovedState` command (as described in [How to use Key Vault soft-delete with PowerShell](./key-vault-recovery.md?tabs=azure-powershell#key-vault-powershell).
72+
Upon deleting a key vault object, such as a key, the service will place the object in a deleted state, making it inaccessible to any retrieval operations. While in this state, the key vault object can only be listed, recovered, or forcefully/permanently deleted. To view the objects, use the Azure CLI `az keyvault key list-deleted` command (as documented in [How to use Key Vault soft-delete with CLI](./key-vault-recovery.md)), or the Azure PowerShell `Get-AzKeyVault -InRemovedState` command (as described in [How to use Key Vault soft-delete with PowerShell](./key-vault-recovery.md?tabs=azure-powershell#key-vault-powershell)).
7373

7474
At the same time, Key Vault will schedule the deletion of the underlying data corresponding to the deleted key vault or key vault object for execution after a predetermined retention interval. The DNS record corresponding to the vault is also retained for the duration of the retention interval.
7575

articles/mysql/TOC.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@
123123
displayName: replication, read replica
124124
- name: Read replicas
125125
href: flexible-server/concepts-read-replicas.md
126-
- name: Security
127-
items:
128-
- name: Data encryption with a customer managed key
129-
href: flexible-server/concepts-customer-managed-key-mysql-flexible-server.md
130126
- name: Backup & Restore
131127
items:
132128
- name: Backup & Restore concepts

articles/mysql/flexible-server/concepts-customer-managed-key-mysql-flexible-server.md

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

0 commit comments

Comments
 (0)