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

modify liblsd license headers #1829

Merged
merged 2 commits into from Nov 13, 2018

Conversation

Projects
None yet
4 participants
@garlick
Copy link
Member

garlick commented Nov 10, 2018

This PR makes changes to the list and cbuf files in liblsd requested by @dun. (Thanks for the meticulous research to be sure flux license ends up clean and we give proper attribution to contributions).

I didn't go find the original commit id's from conman or lsd-tools since these have been in our tree for a while, but maybe we can go find those and squash that info into the commit message.

Don't merge yet pending an offline discussion to be sure we're all on the same page.

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Nov 10, 2018

Codecov Report

❗️ No coverage uploaded for pull request base (master@81411fb). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #1829   +/-   ##
=========================================
  Coverage          ?   79.75%           
=========================================
  Files             ?      197           
  Lines             ?    35277           
  Branches          ?        0           
=========================================
  Hits              ?    28135           
  Misses            ?     7142           
  Partials          ?        0

@garlick garlick requested a review from dun Nov 12, 2018

garlick added some commits Nov 10, 2018

liblsd/cbuf: modify license header
Modify license header per @dun to more correctly indicate
cbuf's origin and grant a license terms needed by Flux.

GPL license compatibility matrix is summarized here:

https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility
liblsd/list: modify license header
Modify license header per @dun to more appropriately
indicate the origin of the work, document its original
license terms, and grant additional terms that Flux
requires.

GPL license compatibility matrix is summarized here:

https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility

@garlick garlick force-pushed the garlick:lsd_license branch from ea2ba32 to fa05eb8 Nov 12, 2018

@garlick

This comment has been minimized.

Copy link
Member Author

garlick commented Nov 12, 2018

Rebased on current master and fixed cut & paste whitespace issue identified in flux-framework/flux-security#87.

@dun

dun approved these changes Nov 12, 2018

Copy link

dun left a comment

Looks good.

@garlick

This comment has been minimized.

Copy link
Member Author

garlick commented Nov 12, 2018

Thanks @dun. These can go in if somebody wants to push the button.

@chu11

This comment has been minimized.

Copy link
Contributor

chu11 commented Nov 13, 2018

pushing the button

@chu11 chu11 merged commit f2adaaf into flux-framework:master Nov 13, 2018

3 checks passed

codecov/patch Coverage not affected.
Details
codecov/project No report found to compare against
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@garlick

This comment has been minimized.

Copy link
Member Author

garlick commented Nov 13, 2018

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.