From fcce4884dad003a10cddc19165da8a734dd01e8f Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Tue, 17 Jun 2014 10:18:08 -0700 Subject: [PATCH] Require two LGTMs for non-maintainer changes. Docker-DCO-1.1-Signed-off-by: Victor Marmol (github: vmarmol) --- CONTRIBUTORS_GUIDE.md | 10 +++++----- MAINTAINERS_GUIDE.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS_GUIDE.md b/CONTRIBUTORS_GUIDE.md index 6c0c416e..3bcc5dce 100644 --- a/CONTRIBUTORS_GUIDE.md +++ b/CONTRIBUTORS_GUIDE.md @@ -112,12 +112,12 @@ and that all the tests pass. libcontainer maintainers use LGTM (looks good to me) in comments on the code review to indicate acceptance. -A change requires LGTMs from at lease one maintainer of each -component affected. For example, if a change affects `netlink/` and `security/`, it -needs at least one LGTM from the maintainers of `netlink/` AND, separately, at -least one LGTM from the maintainers of `security/`. +A change requires LGTMs from at lease two maintainers. One of those must come from +a maintainer of the component affected. For example, if a change affects `netlink/` +and `security`, it needs at least one LGTM from a maintainer of each. Maintainers +only need one LGTM as presumably they LGTM their own change. -For more details see [MAINTAINERS.md](hack/MAINTAINERS.md) +For more details see [MAINTAINERS.md](MAINTAINERS.md) ### Sign your work diff --git a/MAINTAINERS_GUIDE.md b/MAINTAINERS_GUIDE.md index b6783239..2ac9ca21 100644 --- a/MAINTAINERS_GUIDE.md +++ b/MAINTAINERS_GUIDE.md @@ -63,7 +63,7 @@ All decisions are pull requests, and the relevant maintainers make decisions by accepting or refusing the pull request. Review and acceptance by anyone is denoted by adding a comment in the pull request: `LGTM`. However, only currently listed `MAINTAINERS` are counted towards the required -majority. +two LGTMs. libcontainer follows the timeless, highly efficient and totally unfair system known as [Benevolent dictator for life](http://en.wikipedia.org/wiki/Benevolent_Dictator_for_Life), with Michael Crosby in the role of BDFL.