Skip to content

Commit 43edaf6

Browse files
authored
Merge pull request #242140 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 0fa14ff + 3debc0d commit 43edaf6

24 files changed

+259
-99
lines changed

articles/active-directory/fundamentals/parallel-identity-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Then when a Litware employee wishes to access a Contoso app, they can do so by a
219219

220220
### Option 8 - Configure B2B but with a common HR feed for both directories
221221

222-
In some situations, after acquisition the organization may converge on a single HR platform, but still run existing identity management systems. In this scenario, MIM could provision users into multiple Active Directory systems, depending on with part of the organization the user is affiliated with. They could continue to use B2B so that users authenticate their existing directory, and have a unified GAL.
222+
In some situations, after acquisition the organization may converge on a single HR platform, but still run existing identity management systems. In this scenario, MIM could provision users into multiple Active Directory systems, depending on which part of the organization the user is affiliated with. They could continue to use B2B so that users authenticate their existing directory, and have a unified GAL.
223223

224224
![Configure B2B users but with a common HR system feed](media/parallel-identity-options/identity-combined-8.png)
225225

articles/aks/azure-disk-csi.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,10 @@ Expand the PVC by increasing the `spec.resources.requests.storage` field running
288288
kubectl patch pvc pvc-azuredisk --type merge --patch '{"spec": {"resources": {"requests": {"storage": "15Gi"}}}}'
289289
```
290290

291+
> [!NOTE]
292+
> Shrinking persistent volumes is currently not supported. Trying to patch an existing PVC with a smaller size than the current one leads to the following error message:
293+
> `The persistentVolumeClaim "pvc-azuredisk" is invalid: spec.resources.requests.storage: Forbidden: field can not be less than previous value.`
294+
291295
The output of the command resembles the following example:
292296

293297
```output

articles/aks/supported-kubernetes-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ View the upcoming version releases on the AKS Kubernetes release calendar. To se
4141
> [!NOTE]
4242
> AKS follows 12 months of support for a generally available (GA) Kubernetes version. To read more about our support policy for Kubernetes versioning, please read our [FAQ](./supported-kubernetes-versions.md#faq).
4343
44-
For the past release history, see [Kubernetes history](https://en.wikipedia.org/wiki/Kubernetes#History).
44+
For the past release history, see [Kubernetes history](https://github.com/kubernetes/kubernetes/releases).
4545

4646
| K8s version | Upstream release | AKS preview | AKS GA | End of life |
4747
|--------------|-------------------|--------------|---------|-------------|

articles/azure-cache-for-redis/cache-best-practices-enterprise-tiers.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ The _Enterprise clustering policy_ is a simpler configuration that utilizes a si
108108

109109
Because the Enterprise tiers use a clustered configuration, you might see `CROSSSLOT` exceptions on commands that operate on multiple keys. Behavior varies depending on the clustering policy used. If you use the OSS clustering policy, multi-key commands require all keys to be mapped to [the same hash slot](https://docs.redis.com/latest/rs/databases/configure/oss-cluster-api/#multi-key-command-support).
110110

111-
You might also see `CROSSSLOT` errors with Enterprise clustering policy. Only the following multi-key commands are allowed across slots with Enterprise clustering: `DEL`, `MSET`, `MGET`, `EXISTS`, `UNLINK`, and `TOUCH`. For more information, see [Database clustering](https://docs.redis.com/latest/rs/databases/durability-ha/clustering/#multikey-operations).
111+
You might also see `CROSSSLOT` errors with Enterprise clustering policy. Only the following multi-key commands are allowed across slots with Enterprise clustering: `DEL`, `MSET`, `MGET`, `EXISTS`, `UNLINK`, and `TOUCH`.
112+
In Active-Active databases, multi-key write commands (`DEL`, `MSET`, `UNLINK`) can only be run on keys that are in the same slot. However, the following multi-key commands are allowed across slots in Active-Active databases: `MGET`, `EXISTS`, and `TOUCH`. For more information, see [Database clustering](https://docs.redis.com/latest/rs/databases/durability-ha/clustering/#multikey-operations).
112113

113114
## Handling Region Down Scenarios with Active Geo-Replication
114115

508 KB
Loading
829 KB
Loading
526 KB
Loading
518 KB
Loading
949 KB
Loading
352 KB
Loading

0 commit comments

Comments
 (0)