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.

Sign up for GitHub

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

Jump to bottom

Backport of docs: Initial HCP Rebrand into release/1.18.x #21002

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Backport of docs: Initial HCP Rebrand into release/1.18.x #21002

merged 2 commits into from
Apr 22, 2024

Conversation

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

Backport

This PR is auto-generated from #21000 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: "9ed6c9329017800f81650f302fe23d9980dd199f", automatic backport requires rebase workflow

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

Description

This PR updates references to Terraform Cloud in the Consul docs.

Do not merge before 9 AM PST on April 22, 2024.

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/hcp-terraform-rebrand/correctly-liberal-lemming branch from bf122e0 to 413f808 Compare April 22, 2024 13:07
@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Apr 22, 2024
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Apr 22, 2024
View reviewed changes
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

@krastin krastin marked this pull request as ready for review April 22, 2024 13:10
@krastin krastin requested a review from a team as a code owner April 22, 2024 13:10
@vercel vercel bot temporarily deployed to Preview – consul April 22, 2024 13:14 Inactive
boruszak
boruszak approved these changes Apr 22, 2024
View reviewed changes
Copy link
Contributor

@boruszak boruszak left a comment

Choose a reason for hiding this comment

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

LGTM!

@krastin krastin merged commit d0b964c into release/1.18.x Apr 22, 2024
58 checks passed
@krastin krastin deleted the backport/docs/hcp-terraform-rebrand/correctly-liberal-lemming branch April 22, 2024 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@boruszak boruszak boruszak approved these changes

Assignees

@krastin krastin

Labels
theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hc-github-team-consul-core @boruszak @github-team-consul-core-pr-approver @krastin