From ffddb4dcc1cfb9c342d9742f41f2ebed905bafaf Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 10 Jun 2016 15:44:34 +0200 Subject: [PATCH 1/4] Add developers certificate of origin Source: http://developercertificate.org/ Not modified, but embedded in CONTRIBUTING.md --- CONTRIBUTING.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea3e73ef..cbcc0d2f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -161,6 +161,47 @@ from the others by `"/`". See below: | test/missing | Test missing | [search][search-test/missing] | | test/new | New test | [search][search-test/new] | +## Developer Certificate of Origin + +``` +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +660 York Street, Suite 102, +San Francisco, CA 94110 USA + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +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 + +(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 + +(c) The contribution was provided directly to me by some other + 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. +``` + ## FAQ _to be written_ From 971fbc192dff9f76302d8678e5d5d4503afd65d9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 10 Jun 2016 15:45:21 +0200 Subject: [PATCH 2/4] Add note that each contributor agrees to DCOO --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbcc0d2f..3ab1f9a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,6 +5,10 @@ So you want to contribute to imag! Thank you, that's awesome of you! If you already have something in mind, go ahead with [the prerequisites section](#prerequisites). If you don't know what you could do, start here. +All contribors agree to the +[developer certificate of origin](#developer-certificate-of-origin) +by contributing to imag. + ## Finding an issue Finding an issue is simple: We have From 09de338b495dbe8f4e44bdcd9c0d37c185c0b9fc Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 10 Jun 2016 15:46:12 +0200 Subject: [PATCH 3/4] Add guideline how to contributing without github acc --- CONTRIBUTING.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ab1f9a1..a4218017 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,27 @@ All contribors agree to the [developer certificate of origin](#developer-certificate-of-origin) by contributing to imag. +## Without Github + +If you do not want to use github for your contribution, this is completely okay +with us. Feel free to contact [me](https://github.com/matthiasbeyer) via mail, +feel also free to submit patches via mail (use `git format-patch` and +`git send-email`, always add a cover letter to describe your submission). + +Also ensure that each commit has +[a "Signed-off-by: " line](https://stackoverflow.com/questions/1962094/what-is-the-sign-off-feature-in-git-for). +By adding that line, you agree to our +[developer certificate of origin](#developer-certificate-of-origin). + +We do not have a mailinglist, so we do not have a process where all contributors +can review your PR. This means that once _I am_ okay with your patchset, I will +submit it as PR in the github repository, so more people can review it and CI +can test it. I might come back to you if something broke in CI or someone has a +suggestion how to improve your PR. +I will keep you as author auf the commits. + +The following sections describe the way how to contribute with github. + ## Finding an issue Finding an issue is simple: We have From 5417b01864fb7b14b249f360aa4007a4df5544e3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 24 Jun 2016 17:58:18 +0200 Subject: [PATCH 4/4] fixup! Add guideline how to contributing without github acc --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a4218017..bc9cc903 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ can review your PR. This means that once _I am_ okay with your patchset, I will submit it as PR in the github repository, so more people can review it and CI can test it. I might come back to you if something broke in CI or someone has a suggestion how to improve your PR. -I will keep you as author auf the commits. +I will keep you as author of the commits. The following sections describe the way how to contribute with github.