From 209771eb63ad4adc9f5e35333200a9750348153d Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 13 Jul 2016 15:41:17 -0700 Subject: [PATCH 1/9] meta: include a minimal CTC removal policy Add a sentence identifying a request for voluntary resignation as the typical mechanism for addressing inactive CTC members. --- GOVERNANCE.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 490a2c91a678fc..76a7b067b36799 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -79,8 +79,10 @@ membership beyond these rules. The CTC may add additional members to the CTC by a standard CTC motion. -A CTC member may be removed from the CTC by voluntary resignation, or by -a standard CTC motion. +When a CTC member's participation in CTC matters has become minimal for a +sustained period of time, the CTC will respectfully ask that member to resign +from the CTC. In addition to voluntary resignation, a CTC member may be removed +by a standard CTC motion. Changes to CTC membership should be posted in the agenda, and may be suggested as any other agenda item (see "CTC Meetings" below). From 5e9439ada51065bfbf522e06cf8566ea7d11416d Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 15:14:06 -0700 Subject: [PATCH 2/9] squash: reword --- GOVERNANCE.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 76a7b067b36799..ad7e4b2230dda4 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -56,6 +56,8 @@ For the current list of Collaborators, see the project A guide for Collaborators is maintained in [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md). +### Collaborator Activities + Typical activities of a Collaborator include: * helping users and novice contributors @@ -79,10 +81,11 @@ membership beyond these rules. The CTC may add additional members to the CTC by a standard CTC motion. -When a CTC member's participation in CTC matters has become minimal for a -sustained period of time, the CTC will respectfully ask that member to resign -from the CTC. In addition to voluntary resignation, a CTC member may be removed -by a standard CTC motion. +When a CTC member's participation in [CTC activities](#ctc-activites) has become +minimal for a sustained period of time, the CTC will request that the member +either indicate an intention to increase participation or convert to observer +status. CTC members may only be removed by voluntary resignation or through a +standard CTC motion. Changes to CTC membership should be posted in the agenda, and may be suggested as any other agenda item (see "CTC Meetings" below). @@ -94,6 +97,8 @@ the CTC membership shares an employer, then the situation must be immediately remedied by the resignation or removal of one or more CTC members affiliated with the over-represented employer(s). +### CTC Activities + Typical activities of a CTC member include: * attending the weekly meeting @@ -106,7 +111,7 @@ Typical activities of a CTC member include: Note that CTC members are also Collaborators and therefore typically perform Collaborator activities as well. -## CTC Meetings +### CTC Meetings The CTC meets weekly in a voice conference call. The meeting is run by a designated moderator approved by the CTC. Each meeting is streamed on YouTube. From 1f6d07ca93121b6f84494af920390609f4901d28 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 15:18:26 -0700 Subject: [PATCH 3/9] squash: further clarification --- GOVERNANCE.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index ad7e4b2230dda4..e18c63abce644b 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -83,9 +83,11 @@ The CTC may add additional members to the CTC by a standard CTC motion. When a CTC member's participation in [CTC activities](#ctc-activites) has become minimal for a sustained period of time, the CTC will request that the member -either indicate an intention to increase participation or convert to observer -status. CTC members may only be removed by voluntary resignation or through a -standard CTC motion. +either indicate an intention to increase participation or voluntarily resign. +Former CTC members may be given a standing invitation to the CTC meeting as a +non-voting participant so that they may assist the CTC in areas where they have +particular expertise. CTC members may only be removed by voluntary resignation +or through a standard CTC motion. Changes to CTC membership should be posted in the agenda, and may be suggested as any other agenda item (see "CTC Meetings" below). From 2016389c8991251fba4d24caaef04b7466d86878 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 15:22:39 -0700 Subject: [PATCH 4/9] squash: split up --- GOVERNANCE.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index e18c63abce644b..fa4eab020343c7 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -84,10 +84,13 @@ The CTC may add additional members to the CTC by a standard CTC motion. When a CTC member's participation in [CTC activities](#ctc-activites) has become minimal for a sustained period of time, the CTC will request that the member either indicate an intention to increase participation or voluntarily resign. -Former CTC members may be given a standing invitation to the CTC meeting as a -non-voting participant so that they may assist the CTC in areas where they have -particular expertise. CTC members may only be removed by voluntary resignation -or through a standard CTC motion. + +Individuals, including former CTC members, may be given a standing invitation to +the CTC meeting as a non-voting participant so that they may assist the CTC in +areas where they have particular expertise. + +CTC members may only be removed by voluntary resignation or through a standard +CTC motion. Changes to CTC membership should be posted in the agenda, and may be suggested as any other agenda item (see "CTC Meetings" below). From 7cace0297e8590812622a9672116c0fcec7bf4c4 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 15:24:54 -0700 Subject: [PATCH 5/9] squash: move --- GOVERNANCE.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index fa4eab020343c7..adacb9db42b809 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -85,15 +85,11 @@ When a CTC member's participation in [CTC activities](#ctc-activites) has become minimal for a sustained period of time, the CTC will request that the member either indicate an intention to increase participation or voluntarily resign. -Individuals, including former CTC members, may be given a standing invitation to -the CTC meeting as a non-voting participant so that they may assist the CTC in -areas where they have particular expertise. - CTC members may only be removed by voluntary resignation or through a standard CTC motion. Changes to CTC membership should be posted in the agenda, and may be -suggested as any other agenda item (see "CTC Meetings" below). +suggested as any other agenda item (see [CTC Meetings](ctc-meetings) below). No more than 1/3 of the CTC members may be affiliated with the same employer. If removal or resignation of a CTC member, or a change of @@ -140,7 +136,10 @@ beginning of each meeting. The moderator and the CTC cannot veto or remove items. The CTC may invite persons or representatives from certain projects to -participate in a non-voting capacity. +participate in a non-voting capacity. Individuals, including former CTC members, +may be given a standing invitation to the CTC meeting as a non-voting +participant so that they may assist the CTC in areas where they have particular +expertise. The moderator is responsible for summarizing the discussion of each agenda item and sending it as a pull request after the meeting. From bf385f30ae98bace2fa78bc6e8f6431205c3e202 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 15:25:21 -0700 Subject: [PATCH 6/9] squash: hashtag --- GOVERNANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index adacb9db42b809..c6e6aa97e9e778 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -89,7 +89,7 @@ CTC members may only be removed by voluntary resignation or through a standard CTC motion. Changes to CTC membership should be posted in the agenda, and may be -suggested as any other agenda item (see [CTC Meetings](ctc-meetings) below). +suggested as any other agenda item (see [CTC Meetings](#ctc-meetings) below). No more than 1/3 of the CTC members may be affiliated with the same employer. If removal or resignation of a CTC member, or a change of From 7ad0e1b606c4a5af3cb9beea7439fc3e084f65d7 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 15:25:56 -0700 Subject: [PATCH 7/9] remove superfluous --- GOVERNANCE.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index c6e6aa97e9e778..eeaeac23c420b5 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -136,10 +136,7 @@ beginning of each meeting. The moderator and the CTC cannot veto or remove items. The CTC may invite persons or representatives from certain projects to -participate in a non-voting capacity. Individuals, including former CTC members, -may be given a standing invitation to the CTC meeting as a non-voting -participant so that they may assist the CTC in areas where they have particular -expertise. +participate in a non-voting capacity. The moderator is responsible for summarizing the discussion of each agenda item and sending it as a pull request after the meeting. From d41f26d4e796391aa4ab57251d9fb309b37c0e5a Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 15:26:28 -0700 Subject: [PATCH 8/9] squash: space --- GOVERNANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index eeaeac23c420b5..4e03ba33e7b993 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -136,7 +136,7 @@ beginning of each meeting. The moderator and the CTC cannot veto or remove items. The CTC may invite persons or representatives from certain projects to -participate in a non-voting capacity. +participate in a non-voting capacity. The moderator is responsible for summarizing the discussion of each agenda item and sending it as a pull request after the meeting. From e9e21433c213c2f17b3ab4d1e575436cec1be0df Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 28 Jul 2016 20:41:13 -0700 Subject: [PATCH 9/9] squash: typo fix --- GOVERNANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 4e03ba33e7b993..d3ba8355e0fca8 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -81,7 +81,7 @@ membership beyond these rules. The CTC may add additional members to the CTC by a standard CTC motion. -When a CTC member's participation in [CTC activities](#ctc-activites) has become +When a CTC member's participation in [CTC activities](#ctc-activities) has become minimal for a sustained period of time, the CTC will request that the member either indicate an intention to increase participation or voluntarily resign.