diff --git a/CLA.md b/CLA.md deleted file mode 100644 index 31b0c98dbd9..00000000000 --- a/CLA.md +++ /dev/null @@ -1,19 +0,0 @@ -Sign the CLA -============= - -This page is the step-by-step guide to signing the Consensys AG -Individual Contributor License Agreement. - -1. First and foremost, read [the current version of the CLA]. - It is written to be as close to plain English as possible. - -2. Make an account on [GitHub] if you don't already have one. - -3. After creating your first pull request, you will see a merge - pre-requisite requiring to you read and sign the CLA. - -If you have any questions, you can reach us on [Besu chat]. - -[Besu chat]: https://chat.hyperledger.org/channel/besu -[GitHub]: https://github.com/ -[the current version of the CLA]: https://gist.github.com/rojotek/978b48a5e8b68836856a8961d6887992 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cca2c813dd1..1c4c080e26b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -182,7 +182,7 @@ The process described here has several goals: Please follow these steps to have your contribution considered by the approvers: -1. Complete the CLA, as described in [CLA.md]. +1. Ensure all commits have a Sign-off for DCO, as described in [DCO.md]. 2. Follow all instructions in [PULL-REQUEST-TEMPLATE.md](.github/pull_request_template.md). 4. Follow the [Style Guides](#documentation-style-guide). 5. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) @@ -219,6 +219,6 @@ in this guide. [Hyperledger Besu chat]: https://chat.hyperledger.org/channel/besu [Hyperledger Besu documentation]: https://besu.hyperledger.org/ -[CLA.md]: ./CLA.md +[DCO.md]: ./DCO.md [Code Reviews]: ./docs/community/code-reviews.md -[MkDocs]: https://www.mkdocs.org/ \ No newline at end of file +[MkDocs]: https://www.mkdocs.org/ diff --git a/DCO.md b/DCO.md new file mode 100644 index 00000000000..a10deeec06a --- /dev/null +++ b/DCO.md @@ -0,0 +1,9 @@ +DCO +=== + +As per section 13.a of the [Hyperledger Charter](https://www.hyperledger.org/about/charter) all code submitted to the Hyperledger Foundation needs to have a [Developer Certificate of Origin](http://developercertificate.org/) (DCO) sign-off. + +The sign off needs to be using your legal name, not a pseudonym. Git has a built-in mechanism to allow this with the `-s` or `--signoff` argument to `git commit` command, providing your `user.name` and `user.email` have been setup correctly. + +If you have any questions, you can reach us on [Besu chat]. +[Besu chat]: https://chat.hyperledger.org/channel/besu