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 copy the license file into artifacts into release/1.1.x #480

Conversation

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

Backport

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

🚨

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: POST https://api.github.com/repos/hashicorp/consul-dataplane/merges: 409 Merge conflict []

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

Copy link

hashicorp-cla-app bot commented Apr 29, 2024

CLA assistant check
All committers have signed the CLA.

Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@xwa153 xwa153 marked this pull request as ready for review April 29, 2024 19:47
@xwa153 xwa153 requested a review from a team April 29, 2024 19:47
@xwa153 xwa153 requested a review from a team as a code owner April 29, 2024 19:47
@xwa153 xwa153 requested review from shore and claire-labry and removed request for a team April 29, 2024 19:47
@xwa153 xwa153 force-pushed the backport/NET-9076/xw-add-license-file/violently-faithful-gnu branch from abeee7b to 1e0c905 Compare April 29, 2024 21:40
@xwa153 xwa153 merged commit eb162a8 into release/1.1.x Apr 30, 2024
27 checks passed
@xwa153 xwa153 deleted the backport/NET-9076/xw-add-license-file/violently-faithful-gnu branch April 30, 2024 15:05
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