Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of docs: relocate Consul capacity planning page from waf/ to docs/ into release/1.18.x #21216

Conversation

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

Backport

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

🚨

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:
@krastin
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: "530b458b9923858422582d54cd2ec48e7182036e", automatic backport requires rebase workflow

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


Description

Do not merge until the following related PR is approved and ready for merge:
https://github.com/hashicorp/tutorials/pull/2091

Moving the Consul capacity planning page from WAF/ to docs/ in the shape of an Overview template page.

Testing & Reproduction steps

None

Links

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/krastin/waf-capacityplan/ghastly-patient-condor branch from 84d0b5f to f0309d2 Compare May 24, 2024 12:29
Copy link
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 May 24, 2024
@krastin krastin marked this pull request as ready for review May 24, 2024 12:30
@krastin krastin requested a review from a team as a code owner May 24, 2024 12:30
Copy link
Contributor

@krastin krastin left a comment

Choose a reason for hiding this comment

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

Backport looking good

@krastin krastin enabled auto-merge (squash) May 24, 2024 12:31
@krastin krastin merged commit c5fec4d into release/1.18.x May 24, 2024
56 of 57 checks passed
@krastin krastin deleted the backport/docs/krastin/waf-capacityplan/ghastly-patient-condor branch May 24, 2024 12:36
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