summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Milanesio <luca.milanesio@gmail.com>2023-10-27 07:09:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-10-27 07:09:20 +0000
commit8d29df5dbacae53cc73e5e50ede2f967fa7b454a (patch)
tree7bfbc9cfa24337b1992e6d46c216f7766268c6ac
parentfe46468962fbe866a556283f56b468a1f80bef00 (diff)
parent490dc30e45bd5aa0bc61a871a0182cff325d2acf (diff)
Merge changes If0053e23,I776c1659 into stable-3.9
* changes: docs: dev-roles: Clarify that more CMs are acceptable docs: dev-processes: Remove hardcoded election dates
-rw-r--r--Documentation/dev-processes.txt11
-rw-r--r--Documentation/dev-roles.txt4
2 files changed, 7 insertions, 8 deletions
diff --git a/Documentation/dev-processes.txt b/Documentation/dev-processes.txt
index 175a159e60..41543abd40 100644
--- a/Documentation/dev-processes.txt
+++ b/Documentation/dev-processes.txt
@@ -53,15 +53,14 @@ timely manner.
=== Election of non-Google steering committee members
The election of the non-Google steering committee members happens once
-a year in May. Non-Google link:dev-roles.html#maintainer[maintainers]
+a year in June. Non-Google link:dev-roles.html#maintainer[maintainers]
can nominate themselves by posting an informal application on the
non-public mailto:gerritcodereview-community-managers@googlegroups.com[
-community manager mailing list] by end of April (deadline for 2020
-is Thu 30th of April EOD).
+community manager mailing list] when the call for nomiations is sent to
+the maintainers list by a community manager.
The list with all candidates will be published at the beginning of the
-voting period (for 2020 the start of the voting is planned for Mon 4th
-of May).
+voting period.
Keeping the candidates private during the nomination phase and
publishing all candidates at once only at the start of the voting
@@ -83,7 +82,7 @@ Each non-Google maintainer can vote for 2 candidates. The voting
happens by posting on the
mailto:gerritcodereview-maintainers@googlegroups.com[maintainer mailing
list]. The voting period is 14 calendar days from the start of the
-voting (for 2020 the voting period ends on Mon 18th May EOD).
+voting.
Google maintainers do not take part in this vote, because Google
already has dedicated seats in the steering committee (see section
diff --git a/Documentation/dev-roles.txt b/Documentation/dev-roles.txt
index f3a81e76b6..36fd46e6d3 100644
--- a/Documentation/dev-roles.txt
+++ b/Documentation/dev-roles.txt
@@ -329,10 +329,10 @@ mailto:gerritcodereview-community-managers@googlegroups.com[this mailing list].
This is a group that remains private between the individual community
member and community managers.
-The community managers should be a pair or trio that shares the work:
+The community managers should be at least a pair that shares the work:
* One Googler that is appointed by Google.
-* One or two non-Googlers, elected by the community if there are more
+* One or more non-Googlers, elected by the community if there are more
than two candidates. If there is no candidate, we only have the one
community manager from Google.