Skip to content

Backport of Fix typo into release/1.14.x#17993

Merged
david-yu merged 1 commit into
release/1.14.xfrom
backport/patch-1/centrally-innocent-anemone
Jul 1, 2023
Merged

Backport of Fix typo into release/1.14.x#17993
david-yu merged 1 commit into
release/1.14.xfrom
backport/patch-1/centrally-innocent-anemone

Conversation

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

Backport

This PR is auto-generated from #17198 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:
@david-yu
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: "3eba7e5b5055cc306a3f5eedac6ce26507ff36c7", automatic backport requires rebase workflow

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


Fix a docs typo: servcies => services


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/patch-1/centrally-innocent-anemone branch from fd5f1d5 to 4802cad Compare July 1, 2023 01:55
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/patch-1/centrally-innocent-anemone branch from 2cabca9 to 1041884 Compare July 1, 2023 01:55
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

@github-actions github-actions Bot added the type/docs Documentation needs to be created/updated/clarified label Jul 1, 2023
@david-yu david-yu marked this pull request as ready for review July 1, 2023 01:57
@david-yu david-yu requested a review from a team as a code owner July 1, 2023 01:57
@david-yu david-yu enabled auto-merge (squash) July 1, 2023 01:57
@vercel vercel Bot temporarily deployed to Preview – consul-ui-staging July 1, 2023 02:00 Inactive
@vercel vercel Bot temporarily deployed to Preview – consul July 1, 2023 02:05 Inactive
@david-yu david-yu merged commit 10ad90f into release/1.14.x Jul 1, 2023
@david-yu david-yu deleted the backport/patch-1/centrally-innocent-anemone branch July 1, 2023 02:09
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.

4 participants