Skip to content

Backport of docs: Sameness "beta" warning into release/1.16.x#18021

Merged
david-yu merged 2 commits intorelease/1.16.xfrom
backport/docs/sameness-beta-wording/neatly-capital-martin
Jul 5, 2023
Merged

Backport of docs: Sameness "beta" warning into release/1.16.x#18021
david-yu merged 2 commits intorelease/1.16.xfrom
backport/docs/sameness-beta-wording/neatly-capital-martin

Conversation

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

Backport

This PR is auto-generated from #18017 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:
@boruszak
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: "d13fdcef42ea5bd1ac5f33b6f17a38a6c497ae51", automatic backport requires rebase workflow

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


Description

This PR updates the language around the beta warning for sameneness group docs. Per a Slack conversation, "this version" is too non-specific.

This update uses "all Consul v1.16.x releases" instead.

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/sameness-beta-wording/neatly-capital-martin branch 2 times, most recently from 0d32482 to 78b1476 Compare July 5, 2023 19:56
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/sameness-beta-wording/neatly-capital-martin branch from 038c8e9 to cd3033c Compare July 5, 2023 19:56
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jul 5, 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

@david-yu david-yu marked this pull request as ready for review July 5, 2023 22:04
@david-yu david-yu requested a review from a team as a code owner July 5, 2023 22:04
@david-yu david-yu merged commit 7dcf0d8 into release/1.16.x Jul 5, 2023
@david-yu david-yu deleted the backport/docs/sameness-beta-wording/neatly-capital-martin branch July 5, 2023 22:04
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