@@ -14,137 +14,71 @@ Contributing to `foreman` is easy. In a few simple steps:
1414 * Adhere to code style outlined in the [ Google C++ Style Guide] [ ] and
1515 [ Google Javascript Style Guide] [ ] .
1616
17- * Sign the [ Contributor License Agreement ] ( https://cla.strongloop.com/agreements/strongloop/node-foreman )
17+ * Sign-off your commits to agree to the [ Developer Certificate of Origin (DCO) ] ( https://developercertificate.org/ )
1818
1919 * Submit a pull request through Github.
2020
2121
22- ### Contributor License Agreement ###
22+ ### Sign Your Commits ###
23+
24+ A ` Signed-off-by ` line added to your commits indicates that you are
25+ adhering to the DCO:
26+
27+ ```
28+ This is my commit message
29+
30+ Signed-off-by: Random J Developer <[email protected] > 31+ ```
32+
33+ You can have ` git ` automatically add this line to your commits for you
34+ with the ` -s ` flag:
35+
36+ ```
37+ $ git commit -s -m 'This is my commit message'
38+ ```
39+
40+ #### Developer Certificate of Origin ####
41+
42+ This text is also available at https://developercertificate.org/
2343
2444```
25- Individual Contributor License Agreement
26-
27- By signing this Individual Contributor License Agreement
28- ("Agreement"), and making a Contribution (as defined below) to
29- StrongLoop, Inc. ("StrongLoop"), You (as defined below) accept and
30- agree to the following terms and conditions for Your present and
31- future Contributions submitted to StrongLoop. Except for the license
32- granted in this Agreement to StrongLoop and recipients of software
33- distributed by StrongLoop, You reserve all right, title, and interest
34- in and to Your Contributions.
35-
36- 1. Definitions
37-
38- "You" or "Your" shall mean the copyright owner or the individual
39- authorized by the copyright owner that is entering into this
40- Agreement with StrongLoop.
41-
42- "Contribution" shall mean any original work of authorship,
43- including any modifications or additions to an existing work, that
44- is intentionally submitted by You to StrongLoop for inclusion in,
45- or documentation of, any of the products owned or managed by
46- StrongLoop ("Work"). For purposes of this definition, "submitted"
47- means any form of electronic, verbal, or written communication
48- sent to StrongLoop or its representatives, including but not
49- limited to communication or electronic mailing lists, source code
50- control systems, and issue tracking systems that are managed by,
51- or on behalf of, StrongLoop for the purpose of discussing and
52- improving the Work, but excluding communication that is
53- conspicuously marked or otherwise designated in writing by You as
54- "Not a Contribution."
55-
56- 2. You Grant a Copyright License to StrongLoop
57-
58- Subject to the terms and conditions of this Agreement, You hereby
59- grant to StrongLoop and recipients of software distributed by
60- StrongLoop, a perpetual, worldwide, non-exclusive, no-charge,
61- royalty-free, irrevocable copyright license to reproduce, prepare
62- derivative works of, publicly display, publicly perform,
63- sublicense, and distribute Your Contributions and such derivative
64- works under any license and without any restrictions.
65-
66- 3. You Grant a Patent License to StrongLoop
67-
68- Subject to the terms and conditions of this Agreement, You hereby
69- grant to StrongLoop and to recipients of software distributed by
70- StrongLoop a perpetual, worldwide, non-exclusive, no-charge,
71- royalty-free, irrevocable (except as stated in this Section)
72- patent license to make, have made, use, offer to sell, sell,
73- import, and otherwise transfer the Work under any license and
74- without any restrictions. The patent license You grant to
75- StrongLoop under this Section applies only to those patent claims
76- licensable by You that are necessarily infringed by Your
77- Contributions(s) alone or by combination of Your Contributions(s)
78- with the Work to which such Contribution(s) was submitted. If any
79- entity institutes a patent litigation against You or any other
80- entity (including a cross-claim or counterclaim in a lawsuit)
81- alleging that Your Contribution, or the Work to which You have
82- contributed, constitutes direct or contributory patent
83- infringement, any patent licenses granted to that entity under
84- this Agreement for that Contribution or Work shall terminate as
85- of the date such litigation is filed.
86-
87- 4. You Have the Right to Grant Licenses to StrongLoop
88-
89- You represent that You are legally entitled to grant the licenses
90- in this Agreement.
91-
92- If Your employer(s) has rights to intellectual property that You
93- create, You represent that You have received permission to make
94- the Contributions on behalf of that employer, that Your employer
95- has waived such rights for Your Contributions, or that Your
96- employer has executed a separate Corporate Contributor License
97- Agreement with StrongLoop.
98-
99- 5. The Contributions Are Your Original Work
100-
101- You represent that each of Your Contributions are Your original
102- works of authorship (see Section 8 (Submissions on Behalf of
103- Others) for submission on behalf of others). You represent that to
104- Your knowledge, no other person claims, or has the right to claim,
105- any right in any intellectual property right related to Your
106- Contributions.
107-
108- You also represent that You are not legally obligated, whether by
109- entering into an agreement or otherwise, in any way that conflicts
110- with the terms of this Agreement.
111-
112- You represent that Your Contribution submissions include complete
113- details of any third-party license or other restriction (including,
114- but not limited to, related patents and trademarks) of which You
115- are personally aware and which are associated with any part of
116- Your Contributions.
117-
118- 6. You Don't Have an Obligation to Provide Support for Your Contributions
119-
120- You are not expected to provide support for Your Contributions,
121- except to the extent You desire to provide support. You may provide
122- support for free, for a fee, or not at all.
123-
124- 6. No Warranties or Conditions
125-
126- StrongLoop acknowledges that unless required by applicable law or
127- agreed to in writing, You provide Your Contributions on an "AS IS"
128- BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
129- EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES
130- OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR
131- FITNESS FOR A PARTICULAR PURPOSE.
132-
133- 7. Submission on Behalf of Others
134-
135- If You wish to submit work that is not Your original creation, You
136- may submit it to StrongLoop separately from any Contribution,
137- identifying the complete details of its source and of any license
138- or other restriction (including, but not limited to, related
139- patents, trademarks, and license agreements) of which You are
140- personally aware, and conspicuously marking the work as
141- "Submitted on Behalf of a Third-Party: [named here]".
142-
143- 8. Agree to Notify of Change of Circumstances
144-
145- You agree to notify StrongLoop of any facts or circumstances of
146- which You become aware that would make these representations
147- inaccurate in any respect. Email us at [email protected] . 45+ Developer Certificate of Origin
46+ Version 1.1
47+
48+ Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
49+ 1 Letterman Drive
50+ Suite D4700
51+ San Francisco, CA, 94129
52+
53+ Everyone is permitted to copy and distribute verbatim copies of this
54+ license document, but changing it is not allowed.
55+
56+
57+ Developer's Certificate of Origin 1.1
58+
59+ By making a contribution to this project, I certify that:
60+
61+ (a) The contribution was created in whole or in part by me and I
62+ have the right to submit it under the open source license
63+ indicated in the file; or
64+
65+ (b) The contribution is based upon previous work that, to the best
66+ of my knowledge, is covered under an appropriate open source
67+ license and I have the right under that license to submit that
68+ work with modifications, whether created in whole or in part
69+ by me, under the same open source license (unless I am
70+ permitted to submit under a different license), as indicated
71+ in the file; or
72+
73+ (c) The contribution was provided directly to me by some other
74+ person who certified (a), (b) or (c) and I have not modified
75+ it.
76+
77+ (d) I understand and agree that this project and the contribution
78+ are public and that a record of the contribution (including all
79+ personal information I submit with it, including my sign-off) is
80+ maintained indefinitely and may be redistributed consistent with
81+ this project or the open source license(s) involved.
14882```
14983
15084[ Google C++ Style Guide ] : https://google.github.io/styleguide/cppguide.html
0 commit comments