From c4d1e3de2b672f6b1ab693428fef5567153ef23d Mon Sep 17 00:00:00 2001 From: Mikeal Rogers Date: Tue, 9 Feb 2016 14:07:49 -0800 Subject: [PATCH] doc: update DCO to v1.1 PR-URL: https://github.com/nodejs/node/pull/5170 Reviewed-By: James M Snell Reviewed-By: Sakthipriyan Vairamani Reviewed-By: Ben Noordhuis Reviewed-By: Myles Borins --- CONTRIBUTING.md | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20b0126..987d068 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -174,19 +174,28 @@ to address, apply your changes in a separate commit and push that to your feature branch. Post a comment in the pull request afterwards; GitHub does not send out notifications when you add commits. - -## Developer's Certificate of Origin 1.0 +## Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: * (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license indicated - in the file; or + have the right to submit it under the open source license + indicated in the file; or + * (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source license - and I have the right under that license to submit that work with - modifications, whether created in whole or in part by me, under the - same open source license (unless I am permitted to submit under a - different license), as indicated in the file; or + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + * (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified it. + person who certified (a), (b) or (c) and I have not modified + it. + +* (d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. -- 2.7.4