aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-10-05 16:00:08 -0700
committerIan Lance Taylor <iant@golang.org>2020-10-28 19:28:08 +0000
commit87d59bcdc354b035e17a1dadbfc4883bbcac5bf8 (patch)
tree94a538fe45423fb46e373efcbd6688af1793ffe7
parent1090f0986dd9d7e1f3c31a7f70f45d02ccf49964 (diff)
downloadgo-87d59bcdc354b035e17a1dadbfc4883bbcac5bf8.tar.xz
doc: mention Trust+1 in contribution guide
For #40699 Change-Id: If753a073488880433ae3319dcf2a2dfaa887fd0e Reviewed-on: https://go-review.googlesource.com/c/go/+/259737 Trust: Ian Lance Taylor <iant@golang.org> Trust: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com> Reviewed-by: Russ Cox <rsc@golang.org>
-rw-r--r--doc/contribute.html10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/contribute.html b/doc/contribute.html
index 09d43313ff..f297477fe0 100644
--- a/doc/contribute.html
+++ b/doc/contribute.html
@@ -947,10 +947,18 @@ The Gerrit voting system involves an integer in the range -2 to +2:
</li>
</ul>
+<p>
+At least two maintainers must approve of the change, and at least one
+of those maintainers must +2 the change.
+The second maintainer may cast a vote of Trust+1, meaning that the
+change looks basically OK, but that the maintainer hasn't done the
+detailed review required for a +2 vote.
+</p>
+
<h3 id="submit">Submitting an approved change</h3>
<p>
-After the code has been +2'ed, an approver will
+After the code has been +2'ed and Trust+1'ed, an approver will
apply it to the master branch using the Gerrit user interface.
This is called "submitting the change".
</p>