Skip to content

Backport of Remove merge conflict leftovers on Consul at Scale page into release/1.14.x#16514

Merged
david-yu merged 2 commits into
release/1.14.xfrom
backport/fix_docs_conflict_leftovers/absolutely-subtle-pig
Mar 2, 2023
Merged

Backport of Remove merge conflict leftovers on Consul at Scale page into release/1.14.x#16514
david-yu merged 2 commits into
release/1.14.xfrom
backport/fix_docs_conflict_leftovers/absolutely-subtle-pig

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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

  • updated test coverage
  • external facing docs updated
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix_docs_conflict_leftovers/absolutely-subtle-pig branch 2 times, most recently from 8aec81f to 173811a Compare March 2, 2023 21:03
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Mar 2, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • karras
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

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

@david-yu david-yu marked this pull request as ready for review March 2, 2023 21:22
@david-yu david-yu requested a review from a team as a code owner March 2, 2023 21:22
@david-yu david-yu enabled auto-merge (squash) March 2, 2023 21:26
@david-yu david-yu disabled auto-merge March 2, 2023 21:34
@david-yu david-yu merged commit 83583e0 into release/1.14.x Mar 2, 2023
@david-yu david-yu deleted the backport/fix_docs_conflict_leftovers/absolutely-subtle-pig branch March 2, 2023 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants