Browse code

Merge pull request #3527 from keeb/add-dco

Amend DCO

Guillaume J. Charmes authored on 2014/01/10 02:23:11
Showing 1 changed files
... ...
@@ -113,25 +113,23 @@ pass it on as an open-source patch.  The rules are pretty simple: if you
113 113
 can certify the below:
114 114
 
115 115
 ```
116
-Docker Developer Grant and Certificate of Origin 1.0
116
+Docker Developer Grant and Certificate of Origin 1.1
117 117
 
118 118
 By making a contribution to the Docker Project ("Project"), I represent and warrant that:
119 119
 
120 120
 a. The contribution was created in whole or in part by me and I have the right to submit the contribution on my own behalf or on behalf of a third party who has authorized me to submit this contribution to the Project; or
121 121
 
122
-
123 122
 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 and authorization 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) that I have identified in the contribution; or
124 123
 
125 124
 c. The contribution was provided directly to me by some other person who represented and warranted (a) or (b) and I have not modified it.
126 125
 
127 126
 d. I understand and agree that this Project and the contribution are publicly known and that a record of the contribution (including all personal information I submit with it, including my sign-off record) is maintained indefinitely and may be redistributed consistent with this Project or the open source license(s) involved.
128 127
 
129
-e. I hereby grant to the Project, Docker, Inc and its successors;  and recipients of software distributed by the Project a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, modify, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute this contribution and such modifications and derivative works consistent with this Project, the open source license indicated in the previous work or other appropriate open source license specified by the Project and approved by the Open Source Initiative(OSI) at http://www.opensource.org.
130 128
 ```
131 129
 
132 130
 then you just add a line to every git commit message:
133 131
 
134
-    Docker-DCO-1.0-Signed-off-by: Joe Smith <joe.smith@email.com> (github: github_handle)
132
+    Docker-DCO-1.1-Signed-off-by: Joe Smith <joe.smith@email.com> (github: github_handle)
135 133
 
136 134
 using your real name (sorry, no pseudonyms or anonymous contributions.)
137 135