From ef975a6cda366b6e88eaa63e999e4e7cf8adec27 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 14 Sep 2018 11:55:47 -0600 Subject: [PATCH] Review guide: clarify 2x +2 policies Make it clear that individual teams are free to set their own policies on how many +2 votes are required to approve a patch, and that core reviewers should confirm the policy of the project they're reviewing. Change-Id: Icb2406ef2b4fbd81d1f73ee6efa30a6ca7ea4f14 --- doc/source/review-the-openstack-way.rst | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/source/review-the-openstack-way.rst b/doc/source/review-the-openstack-way.rst index e4dac3b..6fba54b 100644 --- a/doc/source/review-the-openstack-way.rst +++ b/doc/source/review-the-openstack-way.rst @@ -21,17 +21,18 @@ code review process. Code Review +2 ============== -The +2 vote is only available to core reviewers. In general, two +2 votes are -required before a change can be merged, although some projects relax the -requirements in certain circumstances, such as trivial changes. Confusingly, -two +1s do not equal a +2! +The +2 vote is only available to core reviewers. Projects are encouraged to +require two +2 votes before a change can be merged, although some projects only +require a single +2, and many relax the requirements in certain circumstances +(such as trivial changes). If you are a core reviewer, check your local +policies. Confusingly, two +1s do not equal a +2! -Voting +2 indicates that you're happy for another core reviewer to Approve the -change. If another core reviewer has already voted +2 then you would generally -Approve the change at the same time. However, you might hold off on approval to -give the author or another reviewer the chance to respond to some trivial -feedback if they think it appropriate. If the feedback is sufficiently trivial, -this is preferable to only voting +1. +Voting +2 without Approving indicates that you're happy for another core +reviewer to Approve the change. If another core reviewer has already voted +2 +then you would generally Approve the change at the same time. However, you +might hold off on approval to give the author or another reviewer the chance to +respond to some trivial feedback if they think it appropriate. If the feedback +is sufficiently trivial, this is preferable to only voting +1. If another core reviewer had previously voted +2 on an earlier patch set, and the patch has only changed in trivial ways that you're sure they would be happy