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

Cherry-pick #7855 to 6.x: Assert now takes into consideration the license. #8734

Merged
merged 1 commit into from
Oct 24, 2018

Conversation

andrewkroh
Copy link
Member

Cherry-pick of PR #7855 to 6.x branch. Original message:

  • License headers for both Elastic and ASL2 are now accessible by
    code using the licenses package.
    licenses.Elastic
    licenses.ASL2
    
  • Added a generator to take care of syncing the files in the licenses/
    directory.
  • Added LICENSE as a variable for the makefile to configure the
    go-licenser this is useful if a beat as a different license.

- License headers for both Elastic and ASL2 are now accessible by
  code using the licenses package.
      ```
      licenses.Elastic
      licenses.ASL2
      ```
  - Added a generator to take care of syncing the files in the licenses/
  directory.
  - Added `LICENSE` as a variable for the makefile to configure the
  go-licenser this is useful if a beat as a different license.

(cherry picked from commit 437a62a)
Copy link
Contributor

@ph ph left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewkroh andrewkroh merged commit 36d50b7 into elastic:6.x Oct 24, 2018
@andrewkroh andrewkroh deleted the backport_7855_6.x branch November 8, 2018 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants