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 [DO NOT MERGE UNTIL EOY] update year in LICENSE and copywrite files into release/1.17.x #20067

Conversation

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

Backport

This PR is auto-generated from #19780 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:
@hc-github-team-es-release-engineering
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: "4c072b13245fad784d76fdb0d4943d4521f8a222", automatic backport requires rebase workflow

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


DO NOT MERGE UNTIL EOY 2023.

Updates year in LICENSE and related files for main branch of consul.

Backport to 1.17.x only. Older branches will be addressed separately.


Overview of commits

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

@hc-github-team-es-release-engineering hc-github-team-es-release-engineering marked this pull request as ready for review January 2, 2024 16:59
@hc-github-team-es-release-engineering hc-github-team-es-release-engineering merged commit ce7e73b into release/1.17.x Jan 2, 2024
93 checks passed
@hc-github-team-es-release-engineering hc-github-team-es-release-engineering deleted the backport/RELPLAT-959-EOY-license-fixes/abnormally-polite-sculpin branch January 2, 2024 17:00
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.

3 participants