Skip to content

Commit

Permalink
Add copyright/patent issues to possible NACK reasons
Browse files Browse the repository at this point in the history
Adding in response to a Slack discussion where someone was unclear on the fact
that a NACK may be justified if code can't be accepted due to copyright/patent
issues.  For example, it would be reasonable and prudent to NACK a contribution
of AGPL-licensed consensus code on the basis that the license terms are
incompatible with the MIT license used by the rest of the codebase.
  • Loading branch information
petertodd committed Oct 13, 2016
1 parent e2b8c39 commit 36f60a5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ language is used within pull-request comments:

- ACK means "I have tested the code and I agree it should be merged";
- NACK means "I disagree this should be merged", and must be accompanied by
sound technical justification. NACKs without accompanying reasoning may be disregarded;
sound technical justification (or in certain cases of copyright/patent/licensing
issues, legal justification). NACKs without accompanying reasoning may be
disregarded;
- utACK means "I have not tested the code, but I have reviewed it and it looks
OK, I agree it can be merged";
- Concept ACK means "I agree in the general principle of this pull request";
Expand Down

0 comments on commit 36f60a5

Please sign in to comment.