Skip to content

Backport of docs: Fix typo in description for server_addresses into release/1.14.x#18844

Closed
hc-github-team-consul-core wants to merge 5 commits intorelease/1.14.xfrom
backport/docs/gh-issue-18553-typo/mentally-obliging-malamute
Closed

Backport of docs: Fix typo in description for server_addresses into release/1.14.x#18844
hc-github-team-consul-core wants to merge 5 commits intorelease/1.14.xfrom
backport/docs/gh-issue-18553-typo/mentally-obliging-malamute

Conversation

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

Backport

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

🚨

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:
@blake
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: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


Change 'If not port' to 'If no port'.

Resolves #18553

Description

Testing & Reproduction steps

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/gh-issue-18553-typo/mentally-obliging-malamute branch from 2766043 to d89c20b Compare September 18, 2023 17:15
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/gh-issue-18553-typo/mentally-obliging-malamute branch from d89c20b to 2766043 Compare September 18, 2023 17:15
@hashicorp-cla
Copy link

hashicorp-cla commented Sep 18, 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


2 out of 3 committers have signed the CLA.

  • trujillo-adam
  • blake
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have 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
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

@vercel vercel bot temporarily deployed to Preview – consul September 18, 2023 17:19 Inactive
@trujillo-adam trujillo-adam marked this pull request as ready for review September 18, 2023 20:04
@trujillo-adam trujillo-adam added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-metrics-test pr/no-backport type/docs Documentation needs to be created/updated/clarified labels Sep 18, 2023
trujillo-adam and others added 2 commits September 18, 2023 14:15
Change 'If not port' to 'If no port'.
resolve conflicts on manual cherrypick
Resolves #18553
…amute' of github.com:hashicorp/consul into backport/docs/gh-issue-18553-typo/mentally-obliging-malamute

merging with remote branch
@trujillo-adam trujillo-adam requested a review from a team as a code owner September 18, 2023 21:20
@trujillo-adam trujillo-adam enabled auto-merge (squash) September 18, 2023 21:21
auto-merge was automatically disabled September 18, 2023 21:54

Pull request was closed

@blake blake deleted the backport/docs/gh-issue-18553-typo/mentally-obliging-malamute branch September 20, 2023 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry pr/no-metrics-test type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants