Skip to content

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

Merged
im2nguyen merged 1 commit intorelease/1.15.xfrom
backport/docs/note-about-connect-service-upstream-env-var/firmly-included-donkey
Oct 26, 2023
Merged

Backport of Add note about service upstream env var dot broken into release/1.15.x#19397
im2nguyen merged 1 commit intorelease/1.15.xfrom
backport/docs/note-about-connect-service-upstream-env-var/firmly-included-donkey

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

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/firmly-included-donkey branch from 3f54488 to 37a948c Compare October 26, 2023 20:46
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Oct 26, 2023
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:47
@im2nguyen im2nguyen requested a review from a team as a code owner October 26, 2023 20:47
@im2nguyen im2nguyen enabled auto-merge (squash) October 26, 2023 20:47
@hc-github-team-consul-core
Copy link
Collaborator Author

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@im2nguyen im2nguyen merged commit a83ff94 into release/1.15.x Oct 26, 2023
@im2nguyen im2nguyen deleted the backport/docs/note-about-connect-service-upstream-env-var/firmly-included-donkey branch October 26, 2023 20:50
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.

3 participants