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 docs: 1.18.x cleanup into release/1.18.x #20775

Conversation

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

Backport

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

🚨

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

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


Description

  • OpenShift bumps on k8s compat matrix
  • Typos on v2 API pages

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/david-yu-1-18-cleanup/definitely-probable-salmon branch from cc5016e to 0e8f068 Compare March 1, 2024 01:01
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Mar 1, 2024
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

@david-yu david-yu marked this pull request as ready for review March 1, 2024 01:06
@david-yu david-yu requested a review from a team as a code owner March 1, 2024 01:06
@david-yu david-yu merged commit 9496055 into release/1.18.x Mar 1, 2024
58 checks passed
@david-yu david-yu deleted the backport/david-yu-1-18-cleanup/definitely-probable-salmon branch March 1, 2024 01:14
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