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 Fix FIPS copy into release/1.16.x #17692

Merged

Conversation

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

Backport

This PR is auto-generated from #17691 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: "e308cd7e00dd9a99e5cba5303b5daf3f2ed981a4", 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-fips-copy/truly-distinct-honeybee branch from fa95518 to 3edec16 Compare June 13, 2023 03:36
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/fix-fips-copy/truly-distinct-honeybee branch from 8c16d91 to 7707c20 Compare June 13, 2023 03:36
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 Jun 13, 2023
@im2nguyen im2nguyen marked this pull request as ready for review June 13, 2023 03:42
@im2nguyen im2nguyen requested a review from a team as a code owner June 13, 2023 03:42
@im2nguyen im2nguyen merged commit cebbd18 into release/1.16.x Jun 13, 2023
@im2nguyen im2nguyen deleted the backport/docs/fix-fips-copy/truly-distinct-honeybee branch June 13, 2023 03:42
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