Skip to content

Backport of Update enterprise features table with 1.17 features into release/1.17.x#19562

Merged
im2nguyen merged 1 commit intorelease/1.17.xfrom
backport/docs/enteprise-1-17-x-features-table/absolutely-smiling-ocelot
Nov 7, 2023
Merged

Backport of Update enterprise features table with 1.17 features into release/1.17.x#19562
im2nguyen merged 1 commit intorelease/1.17.xfrom
backport/docs/enteprise-1-17-x-features-table/absolutely-smiling-ocelot

Conversation

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

Backport

This PR is auto-generated from #19558 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:
@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: "efeb6ea461705666905e6b2534acf7b6057cec00", 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/enteprise-1-17-x-features-table/absolutely-smiling-ocelot branch from 099e48a to 0f90d9c Compare November 7, 2023 20:30
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/enteprise-1-17-x-features-table/absolutely-smiling-ocelot branch from 350f429 to 0f2ec00 Compare November 7, 2023 20:30
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Nov 7, 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 November 7, 2023 20:32
@im2nguyen im2nguyen requested a review from a team as a code owner November 7, 2023 20:32
@im2nguyen im2nguyen enabled auto-merge (squash) November 7, 2023 20:32
@im2nguyen im2nguyen merged commit de09d23 into release/1.17.x Nov 7, 2023
@im2nguyen im2nguyen deleted the backport/docs/enteprise-1-17-x-features-table/absolutely-smiling-ocelot branch November 7, 2023 20:36
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.

4 participants