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 values.yaml - tlsServerName docs into release/1.1.x #3664

Merged

Conversation

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

Backport

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

🚨

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

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


Changes proposed in this PR

How I've tested this PR

How I expect reviewers to test this PR

Checklist


Overview of commits

@david-yu david-yu marked this pull request as ready for review February 20, 2024 22:23
@david-yu david-yu enabled auto-merge (squash) February 20, 2024 23:41
@david-yu david-yu merged commit 1157afe into release/1.1.x Feb 20, 2024
39 of 41 checks passed
@david-yu david-yu deleted the backport/david-yu-docs-maksim/thoroughly-legal-corgi branch February 20, 2024 23:45
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.

2 participants