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.

Sign up for GitHub

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

Jump to bottom

Backport of Fix typo in permissive mTLS docs into release/1.16.x #18589

Merged
merged 2 commits into from
Sep 18, 2023
Merged

Backport of Fix typo in permissive mTLS docs into release/1.16.x #18589

merged 2 commits into from
Sep 18, 2023

Conversation

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

Backport

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

🚨

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: "e22421846463d6a1a49ceb57cac0fe16f5e6ee78", 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/fix-typo-in-permissive-mtls/heavily-novel-insect branch from 1b95173 to c2836e0 Compare August 28, 2023 15:51
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/fix-typo-in-permissive-mtls/heavily-novel-insect branch from 16fd4d6 to faea2fc Compare August 28, 2023 15:51
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Aug 28, 2023
View reviewed changes
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 type/docs Documentation needs to be created/updated/clarified label Aug 28, 2023
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging August 28, 2023 15:54 Inactive
@vercel vercel bot temporarily deployed to Preview – consul August 28, 2023 16:02 Inactive
@trujillo-adam trujillo-adam marked this pull request as ready for review September 18, 2023 21:30
@trujillo-adam trujillo-adam requested a review from a team as a code owner September 18, 2023 21:30
@trujillo-adam trujillo-adam merged commit ce99c74 into release/1.16.x Sep 18, 2023
@trujillo-adam trujillo-adam deleted the backport/docs/fix-typo-in-permissive-mtls/heavily-novel-insect branch September 18, 2023 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@im2nguyen im2nguyen Awaiting requested review from im2nguyen

Assignees

@im2nguyen im2nguyen

Labels
type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hc-github-team-consul-core @github-team-consul-core-pr-approver @im2nguyen @trujillo-adam