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

[8.0](backport #28786) licenses: Add Elastic License 2.0 (Elasticv2) #28808

Merged
merged 2 commits into from
Nov 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 4, 2021

This is an automatic backport of pull request #28786 done by Mergify.
Cherry-pick of 8556093 has failed:

On branch mergify/bp/8.0/pr-28786
Your branch is up to date with 'origin/8.0'.

You are currently cherry-picking commit 855609362.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   dev-tools/cmd/license/license_generate.go
	modified:   dev-tools/mage/fmt.go
	new file:   licenses/ELASTIC-LICENSE-2.0-header.txt
	new file:   licenses/ELASTIC-LICENSE-2.0.txt
	modified:   licenses/license_header.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Adds the Elastic License 2.0 as `Elasticv2` in the `licenses` package.
Updates the `go-licenser` to `0.4.0`, since it adds support for the
`Elasticv2` license.

Signed-off-by: Marc Lopez Rubio <[email protected]>
(cherry picked from commit 8556093)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner November 4, 2021 08:54
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 4, 2021
@mergify mergify bot assigned marclop Nov 4, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 4, 2021
@marclop marclop added the Team:apm APM Server team issues/PRs label Nov 4, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 4, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 4, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-11-05T01:39:03.818+0000

  • Duration: 198 min 7 sec

  • Commit: 1024fa6

Test stats 🧪

Test Results
Failed 0
Passed 53998
Skipped 5355
Total 59353

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

Signed-off-by: Marc Lopez Rubio <[email protected]>
@marclop marclop removed the conflicts There is a conflict in the backported pull request label Nov 4, 2021
@marclop marclop merged commit 0d6a448 into 8.0 Nov 8, 2021
@marclop marclop deleted the mergify/bp/8.0/pr-28786 branch November 8, 2021 01:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:apm APM Server team issues/PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants