Skip to content

[release-1.26] Azure Load Balancer notes #16762

@istio-testing

Description

@istio-testing

Manual cherrypick required.

#16456 failed to apply on top of branch "release-1.26":

Applying: Azure Load Balancer notes
Using index info to reconstruct a base tree...
M	content/en/docs/ambient/getting-started/deploy-sample-app/index.md
M	content/en/docs/examples/bookinfo/index.md
Falling back to patching base and 3-way merge...
Auto-merging content/en/docs/examples/bookinfo/index.md
Auto-merging content/en/docs/ambient/getting-started/deploy-sample-app/index.md
CONFLICT (content): Merge conflict in content/en/docs/ambient/getting-started/deploy-sample-app/index.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Azure Load Balancer notes

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions