Skip to content

Commit c3c9178

Browse files
authored
Merge pull request #224787 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 6b334cc + 99198d7 commit c3c9178

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

articles/azure-cache-for-redis/cache-how-to-premium-persistence.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ After a rewrite, two sets of AOF files exist in storage. Rewrites occur in the b
227227

228228
Using managed identity adds the cache instance to the [trusted services list](../storage/common/storage-network-security.md?tabs=azure-portal), making firewall exceptions easier to carry out. If you aren't using managed identity and instead authorizing to a storage account using a key, then having firewall exceptions on the storage account tends to break the persistence process.
229229

230+
231+
### Can I have AOF persistence enabled if I have more than one replica?
232+
233+
No, AOF persistence cannot be enabled with replicas (i.e replica count >= 2).
234+
230235
## Next steps
231236

232237
Learn more about Azure Cache for Redis features.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ To create a cache, follow these steps:
5353
1. Configure your settings for clustering and/or RDB persistence.
5454

5555
> [!NOTE]
56-
> Zone redundancy doesn't support AOF persistence or work with geo-replication currently.
56+
> Zone redundancy doesn't support AOF persistence with 2 or more replicas or work with geo-replication currently.
5757
>
5858
5959
1. Select **Create**.

articles/azure-resource-manager/management/manage-resources-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $ctx = $storageAccount.Context
4141

4242
### Deploy a template
4343

44-
The following script creates deploy a Quickstart template to create a storage account. For more information, see [Quickstart: Create Azure Resource Manager templates by using Visual Studio Code](../templates/quickstart-create-templates-use-visual-studio-code.md?tabs=PowerShell).
44+
The following script deploys a Quickstart template to create a storage account. For more information, see [Quickstart: Create Azure Resource Manager templates by using Visual Studio Code](../templates/quickstart-create-templates-use-visual-studio-code.md?tabs=PowerShell).
4545

4646
```azurepowershell-interactive
4747
$resourceGroupName = Read-Host -Prompt "Enter the Resource Group name"
@@ -135,4 +135,4 @@ Tagging helps organizing your resource group and resources logically. For inform
135135
- To learn Azure Resource Manager, see [Azure Resource Manager overview](overview.md).
136136
- To learn the Resource Manager template syntax, see [Understand the structure and syntax of Azure Resource Manager templates](../templates/syntax.md).
137137
- To learn how to develop templates, see the [step-by-step tutorials](../index.yml).
138-
- To view the Azure Resource Manager template schemas, see [template reference](/azure/templates/).
138+
- To view the Azure Resource Manager template schemas, see [template reference](/azure/templates/).

articles/kubernetes-fleet/quickstart-create-fleet-and-members.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ Get started with Azure Kubernetes Fleet Manager (Fleet) by using the Azure CLI t
3737

3838
* [Install or upgrade Azure CLI](/cli/azure/install-azure-cli) to version is at least `2.37.0`
3939

40-
* Enable the following feature for each subscription where you'll be creating the fleet resource or where your AKS clusters that will be joined as members are located in:
41-
42-
```azurecli
43-
az feature register --namespace Microsoft.ContainerService --name FleetResourcePreview
44-
```
45-
4640
* Install the **fleet** Azure CLI extension. Make sure your version is at least `0.1.0`:
4741

4842
```azurecli

0 commit comments

Comments
 (0)