Skip to content

Backport of Add note about service upstream env var dot broken into release/1.17.x#19399

Closed
hc-github-team-consul-core wants to merge 2 commits intorelease/1.17.xfrom
backport/docs/note-about-connect-service-upstream-env-var/lively-exciting-reptile
Closed

Backport of Add note about service upstream env var dot broken into release/1.17.x#19399
hc-github-team-consul-core wants to merge 2 commits intorelease/1.17.xfrom
backport/docs/note-about-connect-service-upstream-env-var/lively-exciting-reptile

Conversation

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

Backport

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

🚨

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

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


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/note-about-connect-service-upstream-env-var/lively-exciting-reptile branch from b7055a0 to 5c40f69 Compare October 26, 2023 20:46
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/note-about-connect-service-upstream-env-var/lively-exciting-reptile branch from 5c40f69 to b7055a0 Compare October 26, 2023 20:46
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 26, 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


1 out of 2 committers have signed the CLA.

  • im2nguyen
  • 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

@im2nguyen im2nguyen marked this pull request as ready for review October 26, 2023 20:51
@im2nguyen im2nguyen requested a review from a team as a code owner October 26, 2023 20:51
@im2nguyen im2nguyen enabled auto-merge (squash) October 26, 2023 20:51
@im2nguyen im2nguyen closed this Oct 26, 2023
auto-merge was automatically disabled October 26, 2023 21:01

Pull request was closed

@github-actions github-actions bot deleted the backport/docs/note-about-connect-service-upstream-env-var/lively-exciting-reptile branch August 29, 2025 06:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants