From f99b7b1cbf2c59ab6540a841a5b1b0cd7f86cc78 Mon Sep 17 00:00:00 2001 From: billy rennekamp Date: Thu, 22 Apr 2021 11:05:52 +0200 Subject: [PATCH 1/7] Proposal for expanding the ADR committee Conversation in the gaia discord seems to merit an update to the ADR committee. I haven't spoken to any of the individuals to confirm their interest or availability but I'd like to use this as a more productive forum to push the conversation further. Especially looking for comment from those proposed (@marbar3778 @ebuchman @robert-zaremba @amaurym @zmanian @sunnya97 @fedekunze @odeke-em ) --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index dc6f4859a8..3e6b601f4e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,9 +5,9 @@ # Secondary repo maintainers, substitutes of the primary # maintainers when they become MIA -* @cwgoes @sunnya97 +* @cwgoes @marbar3778 @ebuchman @robert-zaremba @amaurym @fedekunze @odeke-em # Primary repo maintainers -* @aaronc @alexanderbez @alessio +* @aaronc @alexanderbez @alessio @zmanian @sunnya97 From f5725233574d0ae80ddde53a75ed4b42d4a4067c Mon Sep 17 00:00:00 2001 From: billy rennekamp Date: Thu, 22 Apr 2021 14:22:36 +0200 Subject: [PATCH 2/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46780a54e9..5c9c8fb3a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -374,9 +374,9 @@ of the **Concept Approval Committee**. **Committee Members** -* Core Members: **Aaron** (Regen), **Bez** (Fission), **Alessio** (AiB) +* Core Members: **Aaron** (Regen), **Bez** (IG), **Alessio** (AiB), **Sunny** (Sikka), **Zaki** (Iqlusion) * Secondary pool of candidates to replace / substitute: - * **Chris Goes** (IG), **Sunny** (Sikka) + * **Chris Goes** (Anoma), **Marko** (IG), **Ethan Buchman** (Informal), **Robert** (Regen), **Amaury** (Regen), **Fede** (Tharsis), **Emmanuel** (Orijtech), **Frojdi** (AiB), **Jonathan** (AiB) **Committee Criteria** From e1bd6cf8fa28a146b3d3b15cdcb2b7553b5092d2 Mon Sep 17 00:00:00 2001 From: billy rennekamp Date: Thu, 22 Apr 2021 19:21:39 +0200 Subject: [PATCH 3/7] Update CONTRIBUTING.md Co-authored-by: Alessio Treglia --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5c9c8fb3a2..db2790da13 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -376,7 +376,7 @@ of the **Concept Approval Committee**. * Core Members: **Aaron** (Regen), **Bez** (IG), **Alessio** (AiB), **Sunny** (Sikka), **Zaki** (Iqlusion) * Secondary pool of candidates to replace / substitute: - * **Chris Goes** (Anoma), **Marko** (IG), **Ethan Buchman** (Informal), **Robert** (Regen), **Amaury** (Regen), **Fede** (Tharsis), **Emmanuel** (Orijtech), **Frojdi** (AiB), **Jonathan** (AiB) + * **Chris Goes** (Anoma), **Marko** (IG), **Ethan Buchman** (Informal), **Robert** (Regen), **Amaury** (Regen), **Fede** (Tharsis), **Emmanuel** (Orijtech) **Committee Criteria** From 8de11ba6577d0f81871d50c35f365ccd1c8a12ec Mon Sep 17 00:00:00 2001 From: billy rennekamp Date: Mon, 26 Apr 2021 17:40:10 +0200 Subject: [PATCH 4/7] Update CONTRIBUTING.md Co-authored-by: Alessio Treglia --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index db2790da13..92ae653046 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -374,7 +374,7 @@ of the **Concept Approval Committee**. **Committee Members** -* Core Members: **Aaron** (Regen), **Bez** (IG), **Alessio** (AiB), **Sunny** (Sikka), **Zaki** (Iqlusion) +* Core Members: **Aaron** (Regen), **Bez** (IG), **Sunny** (Sikka), **Zaki** (Iqlusion) * Secondary pool of candidates to replace / substitute: * **Chris Goes** (Anoma), **Marko** (IG), **Ethan Buchman** (Informal), **Robert** (Regen), **Amaury** (Regen), **Fede** (Tharsis), **Emmanuel** (Orijtech) From 3530299dde64ac81ac7c39df784f53a238a7181d Mon Sep 17 00:00:00 2001 From: billy rennekamp Date: Mon, 26 Apr 2021 17:40:17 +0200 Subject: [PATCH 5/7] Update .github/CODEOWNERS Co-authored-by: Alessio Treglia --- .github/CODEOWNERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3e6b601f4e..6153dc6479 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,6 +8,5 @@ * @cwgoes @marbar3778 @ebuchman @robert-zaremba @amaurym @fedekunze @odeke-em # Primary repo maintainers -* @aaronc @alexanderbez @alessio @zmanian @sunnya97 - +* @aaronc @alexanderbez @zmanian @sunnya97 From 985b9017efec7d70cec99080100ba164637a7f59 Mon Sep 17 00:00:00 2001 From: billy rennekamp Date: Mon, 26 Apr 2021 17:55:59 +0200 Subject: [PATCH 6/7] Update CONTRIBUTING.md removed secondary entirely --- CONTRIBUTING.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 92ae653046..a1cd74bc28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -369,14 +369,12 @@ should convene to rectify the situation by either: **Approval Committee & Decision Making** -In absense of general consensus, decision making requires ⅔ vote from the three members +In absense of general consensus, decision making requires 1/2 vote from the two members of the **Concept Approval Committee**. **Committee Members** -* Core Members: **Aaron** (Regen), **Bez** (IG), **Sunny** (Sikka), **Zaki** (Iqlusion) -* Secondary pool of candidates to replace / substitute: - * **Chris Goes** (Anoma), **Marko** (IG), **Ethan Buchman** (Informal), **Robert** (Regen), **Amaury** (Regen), **Fede** (Tharsis), **Emmanuel** (Orijtech) +* Core Members: **Aaron** (Regen), **Bez** (IG) **Committee Criteria** @@ -406,8 +404,7 @@ well as for PRs made as part of a release process: * Code reviewers should ensure the PR does exactly what the ADR said it should * Code reviewers should have more senior engineering capability -* ⅔ approval is required from the **primary repo maintainers** in `CODEOWNERS` - * Secondary pool of candidates to replace / substitute are listed as **secondary repo maintainers** in `CODEOWNERS` +* 1/2 approval is required from the **primary repo maintainers** in `CODEOWNERS` *Note: For any major or minor release series denoted as a "Stable Release" (e.g. v0.39 "Launchpad"), a separate release committee is often established. Stable Releases, and their corresponding release committees are documented From 03eac1e9149ebea111acc9bd5fe36817d918f0c9 Mon Sep 17 00:00:00 2001 From: billy rennekamp Date: Mon, 26 Apr 2021 17:56:42 +0200 Subject: [PATCH 7/7] Update CODEOWNERS --- .github/CODEOWNERS | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6153dc6479..10b85328b6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,10 +3,6 @@ # NOTE: Order is important; the last matching pattern takes the # most precedence. -# Secondary repo maintainers, substitutes of the primary -# maintainers when they become MIA -* @cwgoes @marbar3778 @ebuchman @robert-zaremba @amaurym @fedekunze @odeke-em - # Primary repo maintainers -* @aaronc @alexanderbez @zmanian @sunnya97 +* @aaronc @alexanderbez