Skip to content

Backport of add missing license file into release/1.4.x#3939

Merged
xwa153 merged 2 commits intorelease/1.4.xfrom
backport/NET-9069/xw-add-license-file/informally-massive-longhorn
Apr 22, 2024
Merged

Backport of add missing license file into release/1.4.x#3939
xwa153 merged 2 commits intorelease/1.4.xfrom
backport/NET-9069/xw-add-license-file/informally-massive-longhorn

Conversation

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

Backport

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

🚨

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:
@wangxinyi7
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: "6e23ef26d107edf167c552baf47146a741314655", automatic backport requires rebase workflow

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


DoD

  • Add license file into ZIP
  • Add license file into linux config_dir
  • Add license file into docker image
  • Add license label into docker image

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-9069/xw-add-license-file/informally-massive-longhorn branch from b3404f7 to ed806cd Compare April 22, 2024 18:20
@xwa153 xwa153 marked this pull request as ready for review April 22, 2024 19:44
@xwa153 xwa153 merged commit a382a0b into release/1.4.x Apr 22, 2024
@xwa153 xwa153 deleted the backport/NET-9069/xw-add-license-file/informally-massive-longhorn branch April 22, 2024 19:44
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.

2 participants