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

Revert to Apache 2.0 license verbatim [skip ci] #498

Merged
merged 1 commit into from
Jul 5, 2019

Conversation

mbrukman
Copy link
Contributor

@mbrukman mbrukman commented Jul 2, 2019

Replaced the license with the verbatim contents of the canonical license URL:
https://www.apache.org/licenses/LICENSE-2.0.txt

The license seems to be missing random lines, the entire paragraph at the end,
and should not be replacing the template with a specific copyright as this is the
license, not a copyright statement for the project. Each header has a copyright
statement at the top.

Replaced the license with the verbatim contents of the canonical license URL:
https://www.apache.org/licenses/LICENSE-2.0.txt

The license seems to be missing random lines, the entire paragraph at the end,
and should not be replacing the template with a specific copyright as this is the
license, not a copyright statement for the project. Each header has a copyright
statement at the top.
@MrMage MrMage requested a review from timburks July 3, 2019 06:50
@glbrntt
Copy link
Collaborator

glbrntt commented Jul 3, 2019

We'll also need to apply this patch to the nio branch

@mbrukman
Copy link
Contributor Author

mbrukman commented Jul 3, 2019

Do you merge master into nio or vice versa during the course of development?

Or would you prefer I open a separate PR for the nio branch?

@glbrntt
Copy link
Collaborator

glbrntt commented Jul 3, 2019

No, nio will eventually replace master. A separate PR would be awesome if you don't mind (if not I can create one).

Thanks for spotting this by the way! 😬

@mbrukman
Copy link
Contributor Author

mbrukman commented Jul 3, 2019

Sure, no problem! See #504 for the PR to nio branch.

@MrMage MrMage merged commit cf002e0 into grpc:master Jul 5, 2019
@mbrukman mbrukman deleted the patch-1 branch July 8, 2019 14:35
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.

4 participants