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 Update service-defaults.mdx into release/1.15.x #17671

Merged
merged 1 commit into from
Jun 12, 2023

Conversation

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

Backport

This PR is auto-generated from #17656 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:
@im2nguyen
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: "6651b2de39dfcaa013f5ac2e72fe541ca1efccb7", automatic backport requires rebase workflow

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


Description

when using service-defaults for external services, if the client is dialing an HTTPS (encrypted) traffic, protocol should be set to TCP and port 443.

Testing & Reproduction steps

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/patch-5/utterly-special-sculpin branch from 9260674 to 2a5dece Compare June 12, 2023 19:18
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/patch-5/utterly-special-sculpin branch from 152eca3 to 462a7f2 Compare June 12, 2023 19:18
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jun 12, 2023
Copy link

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-ui-staging June 12, 2023 19:22 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 12, 2023 19:28 Inactive
@im2nguyen im2nguyen marked this pull request as ready for review June 12, 2023 23:35
@im2nguyen im2nguyen requested a review from a team as a code owner June 12, 2023 23:35
@im2nguyen im2nguyen merged commit 2c2d455 into release/1.15.x Jun 12, 2023
@im2nguyen im2nguyen deleted the backport/patch-5/utterly-special-sculpin branch June 12, 2023 23:35
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