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

Following the license change, modify the boilerplates in include/ and crypto/include/ #7770

Closed

Conversation

levitte
Copy link
Member

@levitte levitte commented Dec 6, 2018

No description provided.

@levitte levitte added the branch: master Merge to master branch label Dec 6, 2018
Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

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

Actually not approved for this one. There are relevant travis failures.

@levitte
Copy link
Member Author

levitte commented Dec 6, 2018

Ah, darn, right, it depends on #7766, which was of course not in yet since I did it all in parallel.

A rebase at this point should help.

@levitte levitte force-pushed the newlicense-boilerplate-include branch from b42fe1d to 923d6f5 Compare December 6, 2018 14:19
@levitte
Copy link
Member Author

levitte commented Dec 6, 2018

Okie, rebased, let's see if that makes things better

@levitte
Copy link
Member Author

levitte commented Dec 6, 2018

Travis seems happier!

@levitte
Copy link
Member Author

levitte commented Dec 6, 2018

Merged.

48f4ad7 Following the license change, modify the boilerplates in include/ and crypto/include/

@levitte levitte closed this Dec 6, 2018
levitte added a commit that referenced this pull request Dec 6, 2018
… crypto/include/

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #7770)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch: master Merge to master branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants