Skip to content

Backport of docs: Failover overview minor fix into release/1.16.x#17748

Merged
boruszak merged 1 commit into
release/1.16.xfrom
backport/docs/failover-minor-fix/strictly-humane-dog
Jun 14, 2023
Merged

Backport of docs: Failover overview minor fix into release/1.16.x#17748
boruszak merged 1 commit into
release/1.16.xfrom
backport/docs/failover-minor-fix/strictly-humane-dog

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #17743 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@boruszak
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "2ffa0a819148d8c8e1de6fdfa7e3789bc26f6525", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

I noticed a typo when looking at the failover docs. According to the table, prepared queries support cluster peering. That is incorrect - prepared queries require a primary datacenter. Hence the point of the table - to show the distributed use cases.

It was surely a copy and paste typo - so this PR fixes it!

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/failover-minor-fix/strictly-humane-dog branch 2 times, most recently from 80139cc to db517c0 Compare June 14, 2023 20:46
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@github-actions github-actions Bot added the type/docs Documentation needs to be created/updated/clarified label Jun 14, 2023
@boruszak boruszak marked this pull request as ready for review June 14, 2023 21:56
@boruszak boruszak requested a review from a team as a code owner June 14, 2023 21:56
@boruszak boruszak merged commit a870f2c into release/1.16.x Jun 14, 2023
@boruszak boruszak deleted the backport/docs/failover-minor-fix/strictly-humane-dog branch June 14, 2023 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants