Backport of Remove merge conflict leftovers on Consul at Scale page into release/1.15.x#16515
Merged
david-yu merged 2 commits intoMar 2, 2023
Conversation
hc-github-team-consul-core
force-pushed
the
backport/fix_docs_conflict_leftovers/sincerely-composed-bulldog
branch
2 times, most recently
from
e29cfd5 to
3c43628
Compare
github-team-consul-core-pr-approver
approved these changes
Mar 2, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
github-actions
Bot
added
the
type/docs
david-yu
approved these changes
Mar 2, 2023
…rs/sincerely-composed-bulldog
david-yu
deleted the
backport/fix_docs_conflict_leftovers/sincerely-composed-bulldog
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #16507 to be assessed for backporting due to the inclusion of the label backport/1.15.
WARNING automatic cherry-pick of commits failed. Commits will require human attention.
The below text is copied from the body of the original PR.
Description
This is only a small PR to remove some merge conflict leftovers in the documentation.
Testing & Reproduction steps
See https://developer.hashicorp.com/consul/docs/architecture/scale, scroll to the bottom.
Links
See above
PR Checklist
Overview of commits