From c0c5247485e3947637d3d706adee3204758990c0 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Tue, 18 Sep 2018 13:26:22 +0200 Subject: [PATCH 1/2] doc: specify fast-tracking Currently the documentation is not specific how fast-tracking should be applied. This specifies exactly how things should be done to prevent confusion. --- COLLABORATOR_GUIDE.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index c073c07a7f0996..2dde967104a9aa 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -183,9 +183,12 @@ can be fast-tracked and may be landed after a shorter delay. For example: * Regressions that happen right before a release, or reported soon after. When a pull request is deemed suitable to be fast-tracked, label it with -`fast-track`. The pull request can be landed once 2 or more Collaborators -approve both the pull request and the fast-tracking request, and the necessary -CI testing is done. +`fast-track` and add a comment that collaborators may upvote. Please mention the +collaborators that gave an approval before in that comment. If someone disagrees +with the fast-tracking request, please go ahead and remove the label and leave a +comment why it should not be fast-tracked. The pull request can be landed once 2 +or more Collaborators approve both the pull request and the fast-tracking +request, and the necessary CI testing is done. ### Testing and CI From d8317120933610fe1abc75d6c7e2d71031f52a6d Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 19 Sep 2018 13:04:26 +0200 Subject: [PATCH 2/2] fixup: address comment --- COLLABORATOR_GUIDE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 2dde967104a9aa..0c03e89a077252 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -185,10 +185,10 @@ can be fast-tracked and may be landed after a shorter delay. For example: When a pull request is deemed suitable to be fast-tracked, label it with `fast-track` and add a comment that collaborators may upvote. Please mention the collaborators that gave an approval before in that comment. If someone disagrees -with the fast-tracking request, please go ahead and remove the label and leave a -comment why it should not be fast-tracked. The pull request can be landed once 2 -or more Collaborators approve both the pull request and the fast-tracking -request, and the necessary CI testing is done. +with the fast-tracking request, remove the label and leave a comment why it +should not be fast-tracked. The pull request can be landed once 2 or more +Collaborators approve both the pull request and the fast-tracking request, and +the necessary CI testing is done. ### Testing and CI