From fcb663dbcbd4eba462c40710e53dc84fbe05b9ab Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Fri, 3 Apr 2015 14:04:44 -0700 Subject: [PATCH 1/4] Move docs approval section Signed-off-by: Arnaud Porterie Upstream-commit: 370cef012e81f11a87fcf7f1384dbbca6cab0c6c Component: engine --- components/engine/MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/engine/MAINTAINERS b/components/engine/MAINTAINERS index 546e456b0f..2c897902d2 100644 --- a/components/engine/MAINTAINERS +++ b/components/engine/MAINTAINERS @@ -193,6 +193,11 @@ for each. # They should ask for any editorial change that makes the documentation more # consistent and easier to understand. # + # Changes and additions to docs must be reviewed and approved (LGTM'd) by a minimum of + # two docs sub-project maintainers. If the docs change originates with a docs + # maintainer, only one additional LGTM is required (since we assume a docs maintainer + # approves of their own PR). + # # Once documentation is approved (see below), a maintainer should make sure to remove this # label and add the next one. @@ -201,11 +206,6 @@ for each. 1-design-review = "raises design concerns" 4-merge = "general case" - # Docs approval - [Rules.review.docs-approval] - # Changes and additions to docs must be reviewed and approved (LGTM'd) by a minimum of two docs sub-project maintainers. - # If the docs change originates with a docs maintainer, only one additional LGTM is required (since we assume a docs maintainer approves of their own PR). - # Merge [Rules.review.states.4-merge] From b00d56f4e3b7f862cb041884295ac293337b6006 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Fri, 3 Apr 2015 14:06:46 -0700 Subject: [PATCH 2/4] Sort maintainers alphabetically Signed-off-by: Arnaud Porterie Upstream-commit: 80f3085651717f2f487ae41633490db59716cc04 Component: engine --- components/engine/MAINTAINERS | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/components/engine/MAINTAINERS b/components/engine/MAINTAINERS index 2c897902d2..fe57ea911a 100644 --- a/components/engine/MAINTAINERS +++ b/components/engine/MAINTAINERS @@ -339,7 +339,6 @@ made through a pull request. people = [ - "unclejack", "crosbymichael", "erikh", "estesp", @@ -347,6 +346,7 @@ made through a pull request. "jfrazelle", "lk4d4", "tibor", + "unclejack", "vbatts", "vieux", "vishh" @@ -408,31 +408,31 @@ made through a pull request. people = [ "fredlf", "james", - "sven", + "mary", "spf13", - "mary" + "sven" ] [Org.Subsystems.libcontainer] people = [ "crosbymichael", - "vmarmol", - "mpatel", "jnagal", - "lk4d4" + "lk4d4", + "mpatel", + "vmarmol" ] [Org.Subsystems.registry] people = [ + "dmcg", "dmp42", - "vbatts", + "jlhawn", "joffrey", "samalba", "sday", - "jlhawn", - "dmcg" + "vbatts" ] [Org.Subsystems."build tools"] @@ -471,9 +471,9 @@ made through a pull request. [Org.Subsystem.builder] people = [ + "duglin", "erikh", - "tibor", - "duglin" + "tibor" ] From 64ee249cb8cd61112059b60d7d4f45716da2f9f6 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Fri, 3 Apr 2015 14:12:38 -0700 Subject: [PATCH 3/4] Rename status labels Signed-off-by: Arnaud Porterie Upstream-commit: 58f07c9d8aa9b54f74af141d74314b607e2c18c5 Component: engine --- components/engine/MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/engine/MAINTAINERS b/components/engine/MAINTAINERS index fe57ea911a..8b42f58cf0 100644 --- a/components/engine/MAINTAINERS +++ b/components/engine/MAINTAINERS @@ -131,7 +131,7 @@ for each. """ # Triage - [Rules.review.states.0-triage] + [Rules.review.states.0-needs-triage] # Maintainers are expected to triage new incoming pull requests by removing # the `0-triage` label and adding the correct labels (e.g. `1-design-review`) @@ -149,7 +149,7 @@ for each. 1-design-review = "general case" # Design review - [Rules.review.states.1-design-review] + [Rules.review.states.1-needs-design-review] # Maintainers are expected to comment on the design of the pull request. # Review of documentation is expected only in the context of design validation, @@ -166,7 +166,7 @@ for each. 2-code-review = "general case" # Code review - [Rules.review.states.2-code-review] + [Rules.review.states.2-needs-code-review] # Maintainers are expected to review the code and ensure that it is good # quality and in accordance with the documentation in the PR. @@ -184,7 +184,7 @@ for each. 3-docs-review = "general case" # Docs review - [Rules.review.states.3-docs-review] + [Rules.review.states.3-needs-docs-review] # Maintainers are expected to review the documentation in its bigger context, # ensuring consistency, completeness, validity, and breadth of coverage across @@ -207,7 +207,7 @@ for each. 4-merge = "general case" # Merge - [Rules.review.states.4-merge] + [Rules.review.states.4-needs-merge] # Maintainers are expected to merge this pull request as soon as possible. # They can ask for a rebase, or carry the pull request themselves. From 3099776db6c3e4a81acf7f402e19573b7afdd8b4 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Fri, 3 Apr 2015 14:25:39 -0700 Subject: [PATCH 4/4] Add thaJeztah Signed-off-by: Arnaud Porterie Upstream-commit: 886026f99e4b13b0fa2ee4c5582786a863e1d0d1 Component: engine --- components/engine/MAINTAINERS | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/components/engine/MAINTAINERS b/components/engine/MAINTAINERS index 8b42f58cf0..d6bcf5a1a6 100644 --- a/components/engine/MAINTAINERS +++ b/components/engine/MAINTAINERS @@ -476,6 +476,22 @@ made through a pull request. "tibor" ] + [Org.Curators] + + # The curators help ensure that incoming issues and pull requests are properly triaged and + # that our various contribution and reviewing processes are respected. With their knowledge of + # the repository activity, they can also guide contributors to relevant material or + # discussions. + # + # They are neither code nor docs reviewers, so they are never expected to merge. They can + # however: + # - close an issue or pull request when it's an exact duplicate + # - close an issue or pull request when it's inappropriate or off-topic + + people = [ + "thajeztah" + ] + [people] @@ -600,6 +616,11 @@ made through a pull request. Email = "SvenDowideit@home.org.au" GitHub = "SvenDowideit" + [people.thajeztah] + Name = "Sebastiaan van Stijn" + Email = "github@gone.nl" + GitHub = "thaJeztah" + [people.tianon] Name = "Tianon Gravi" Email = "admwiggin@gmail.com"