Skip to content

Backport of docs: clarify license expiration upgrade behavior into release/1.14.x#16473

Merged
skpratt merged 1 commit into
release/1.14.xfrom
backport/docs/clarify-license-expiration-upgrade-behavior/frankly-hardy-sunbird
Mar 2, 2023
Merged

Backport of docs: clarify license expiration upgrade behavior into release/1.14.x#16473
skpratt merged 1 commit into
release/1.14.xfrom
backport/docs/clarify-license-expiration-upgrade-behavior/frankly-hardy-sunbird

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


Original PR had no description content.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/clarify-license-expiration-upgrade-behavior/frankly-hardy-sunbird branch from a8c9107 to cc29508 Compare February 28, 2023 22:46
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Feb 28, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Copy Markdown
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

@skpratt skpratt force-pushed the backport/docs/clarify-license-expiration-upgrade-behavior/frankly-hardy-sunbird branch from 6721e0a to 23403cd Compare March 2, 2023 16:37
@skpratt skpratt force-pushed the backport/docs/clarify-license-expiration-upgrade-behavior/frankly-hardy-sunbird branch from 23403cd to 186aabd Compare March 2, 2023 16:38
@skpratt skpratt marked this pull request as ready for review March 2, 2023 16:38
@skpratt skpratt requested a review from a team as a code owner March 2, 2023 16:38
@skpratt skpratt merged commit 173811a into release/1.14.x Mar 2, 2023
@skpratt skpratt deleted the backport/docs/clarify-license-expiration-upgrade-behavior/frankly-hardy-sunbird branch March 2, 2023 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants