Skip to content

Backport of add missing license file into release/1.2.x#3937

Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.2.xfrom
backport/NET-9069/xw-add-license-file/moderately-ethical-ape
Closed

Backport of add missing license file into release/1.2.x#3937
hc-github-team-consul-core wants to merge 1 commit intorelease/1.2.xfrom
backport/NET-9069/xw-add-license-file/moderately-ethical-ape

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.2.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: POST https://api.github.com/repos/hashicorp/consul-k8s/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

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-9069/xw-add-license-file/moderately-ethical-ape branch from c56a2dd to feb9f40 Compare April 22, 2024 18:19
@hashicorp-cla-app
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 closed this Apr 22, 2024
@xwa153 xwa153 deleted the backport/NET-9069/xw-add-license-file/moderately-ethical-ape branch April 22, 2024 19:03
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