diff options
| author | Celeste Horgan <celeste@cncf.io> | 2020-08-14 11:38:33 -0700 |
|---|---|---|
| committer | Celeste Horgan <celeste@cncf.io> | 2020-08-14 11:40:02 -0700 |
| commit | 36226eb0ccf50a7a7d73686aeb326e19439432c7 (patch) | |
| tree | 0a54aa0615a8ebeebb2a7ebc038467926743d6ce | |
| parent | 1c1ccd81c30113dce38bfa7e7c1379e676353178 (diff) | |
Add section on emeritus members, link to elections.md
Signed-off-by: Celeste Horgan <celeste@cncf.io>
| -rw-r--r-- | committee-code-of-conduct/README.md | 21 | ||||
| -rw-r--r-- | committee-code-of-conduct/charter.md | 3 |
2 files changed, 18 insertions, 6 deletions
diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index 5e4bac57..eecd02fe 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -32,16 +32,27 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc The members and their terms are as follows: -### Term ends on August 7, 2020 -- Jaice Singer Dumars (Google) -- Jennifer Rondeau (Stripe) -- Carolyn Van Slyck (Microsoft) - ### Term ends on August 7, 2021 + - Aeva van der Veen (Microsoft) - Tasha Drew (VMWare) +### Term ends on August 7, 2022 + +- Karen Chu (Microsoft) +- Celeste Horgan (CNCF) +- Tim Pepper (VMWare) + Please see the [bootstrapping document](./bootstrapping-process.md) for more information on how members are picked, their responsibilities, and how the committee will initially function. +## Emeritus Committee Members + +The Code of Conduct Committee sincerely thanks our emeritus committee members for their contributions. + +- Jaice Singer Dumars (Google) +- Jennifer Rondeau (Stripe) +- Carolyn Van Slyck (Microsoft) +- Paris Pittman (Apple) + _More information on conflict resolution process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to <conduct@kubernetes.io>_. <!-- END CUSTOM CONTENT --> diff --git a/committee-code-of-conduct/charter.md b/committee-code-of-conduct/charter.md index a563c01f..20045097 100644 --- a/committee-code-of-conduct/charter.md +++ b/committee-code-of-conduct/charter.md @@ -65,7 +65,8 @@ authority and enforcement to this committee. The committee can, at its discretion, delegate some authority to those tasked with enforcement.* ## Election -TODO: Our election processes will be outlined in a separate document, coming soon. + +See [elections](https://github.com/kubernetes/community/blob/master/committee-code-of-conduct/election.md) ## Committee Operation The committee strives to respond quickly to reports, as well as initiate |