The branch master has been updated
via cd5f6fd47dd9f73f3fefbd5fad1ea8efb19902e7 (commit)
via 67e47e8ba8c4b28604817c1b1be8756b1e894e21 (commit)
from 320f9a2a880121e1b6cf2f9c8e27814abbc9b31f (commit)
- Log -----------------------------------------------------------------
commit cd5f6fd47dd9f73f3fefbd5fad1ea8efb19902e7
Merge: 320f9a2 67e47e8
Author: Mark J. Cox <m...@openssl.org>
Date: Thu Jun 4 09:29:20 2020 +0100
Merge pull request #171 from t8m/master
Mention the CLA: trivial marker
commit 67e47e8ba8c4b28604817c1b1be8756b1e894e21
Author: Tomáš Mráz <t...@users.noreply.github.com>
Date: Thu Apr 16 12:22:26 2020 +0200
Mention the CLA: trivial marker
-----------------------------------------------------------------------
Summary of changes:
policies/cla.html | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/policies/cla.html b/policies/cla.html
index 51876e4..e29cf7d 100644
--- a/policies/cla.html
+++ b/policies/cla.html
@@ -46,8 +46,10 @@
<p>
In practice, it is required that the author (in the git commit
message) and all approving team members (in the pull request thread)
- agree that a change is trivial. The reviewers will normally post
- a statement to the effect of "I agree that it is a trivial change."
+ agree that a change is trivial. The author has to add "CLA: trivial"
+ in the commit message separated by an empty line from the rest of the
+ message. The reviewers will normally post a statement to the effect
+ of "I agree that it is a trivial change."
</p>
<p>
