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 ui: fix typos for peer service imports into release/1.15.x #18073

Merged
merged 2 commits into from
Jul 12, 2023

Conversation

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

Backport

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

🚨

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: "a9ce2b447f74e688731377a163a7d188fb3e7e63", automatic backport requires rebase workflow

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


Description

A simple typo fix for when the UI has no imported services to show from a cluster peer.

Testing & Reproduction steps

N/A

Links

N/A

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/fix-ui-typos/truly-artistic-ape branch 2 times, most recently from 0752dff to 3706a47 Compare July 11, 2023 13:10
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 theme/ui Anything related to the UI label Jul 11, 2023
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 11, 2023 13:14 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 11, 2023 13:16 Inactive
@krastin krastin marked this pull request as ready for review July 12, 2023 09:13
@krastin krastin merged commit 49f6283 into release/1.15.x Jul 12, 2023
@krastin krastin deleted the backport/fix-ui-typos/truly-artistic-ape branch July 12, 2023 09:43
@jira jira bot mentioned this pull request Aug 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/ui Anything related to the UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants