diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2020-08-07 16:21:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 16:21:56 -0700 |
| commit | 183abe474bcfb4ace984ae2780f38257ec9b356a (patch) | |
| tree | 29cf747e30492a821c41f51382ed826d59fcaf2f | |
| parent | 243f9930949f06f5104a7330c9d05993c4598ab3 (diff) | |
| parent | 830a9dff82e96ae79635bc273c0626a35370c55a (diff) | |
Merge pull request #5018 from spiffxp/code-of-conduct-2020-results
Results of the 2020 code of conduct committee election
| -rw-r--r-- | OWNERS_ALIASES | 6 | ||||
| -rw-r--r-- | committee-code-of-conduct/README.md | 6 | ||||
| -rw-r--r-- | sig-list.md | 2 | ||||
| -rw-r--r-- | sigs.yaml | 21 |
4 files changed, 22 insertions, 13 deletions
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 73f9afe5..5a8bd3b0 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -149,10 +149,10 @@ aliases: - phenixblue committee-code-of-conduct: - AevaOnline - - Bradamant3 - - carolynvs - - jdumars + - celestehorgan + - karenhchu - tashimi + - tpepper committee-product-security: - cjcullen - cji diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index 53ddb30f..5e4bac57 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -15,10 +15,10 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc ## Members * Aeva van der Veen (**[@AevaOnline](https://github.com/AevaOnline)**), Microsoft -* Jennifer Rondeau (**[@Bradamant3](https://github.com/Bradamant3)**), Stripe -* Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**), Microsoft -* Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**), Apple +* Celeste Horgan (**[@celestehorgan](https://github.com/celestehorgan)**), CNCF +* Karen Chu (**[@karenhchu](https://github.com/karenhchu)**), Microsoft * Tasha Drew (**[@tashimi](https://github.com/tashimi)**), VMware +* Tim Pepper (**[@tpepper](https://github.com/tpepper)**), VMware ## Contact - Private Mailing List: conduct@kubernetes.io diff --git a/sig-list.md b/sig-list.md index 0d47dc53..a15bf7d6 100644 --- a/sig-list.md +++ b/sig-list.md @@ -73,7 +73,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md) | Name | Label | Members | Contact | |------|--------|---------|---------| -|[Code of Conduct](committee-code-of-conduct/README.md)|code-of-conduct|* [Aeva van der Veen](https://github.com/AevaOnline), Microsoft<br>* [Jennifer Rondeau](https://github.com/Bradamant3), Stripe<br>* [Carolyn Van Slyck](https://github.com/carolynvs), Microsoft<br>* [Jaice Singer DuMars](https://github.com/jdumars), Apple<br>* [Tasha Drew](https://github.com/tashimi), VMware<br>|* [Private Mailing List](conduct@kubernetes.io) +|[Code of Conduct](committee-code-of-conduct/README.md)|code-of-conduct|* [Aeva van der Veen](https://github.com/AevaOnline), Microsoft<br>* [Celeste Horgan](https://github.com/celestehorgan), CNCF<br>* [Karen Chu](https://github.com/karenhchu), Microsoft<br>* [Tasha Drew](https://github.com/tashimi), VMware<br>* [Tim Pepper](https://github.com/tpepper), VMware<br>|* [Private Mailing List](conduct@kubernetes.io) |[Product Security](committee-product-security/README.md)|product-security|* [CJ Cullen](https://github.com/cjcullen), Google<br>* [Craig Ingram](https://github.com/cji), Salesforce<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Swamy Shivaganga Nagaraju](https://github.com/swamymsft), Microsoft<br>* [Tim Allclair](https://github.com/tallclair), Google<br>|* [Private Mailing List](security@kubernetes.io) |[Steering](committee-steering/README.md)|steering|* [Christoph Blecker](https://github.com/cblecker), Red Hat<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>* [Davanum Srinivas](https://github.com/dims), VMware<br>* [Lachlan Evenson](https://github.com/lachie83), Microsoft<br>* [Nikhita Raghunath](https://github.com/nikhita), VMware<br>* [Paris Pittman](https://github.com/parispittman), Apple<br>* [Aaron Crickenberger](https://github.com/spiffxp), Google<br>|* [Slack](https://kubernetes.slack.com/messages/steering-committee)<br>* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)<br>* [Private Mailing List](steering-private@kubernetes.io) <!-- BEGIN CUSTOM CONTENT --> @@ -2851,18 +2851,27 @@ committees: - github: AevaOnline name: Aeva van der Veen company: Microsoft + - github: celestehorgan + name: Celeste Horgan + company: CNCF + - github: karenhchu + name: Karen Chu + company: Microsoft + - github: tashimi + name: Tasha Drew + company: VMware + - github: tpepper + name: Tim Pepper + company: VMware + emeritus_leads: - github: Bradamant3 name: Jennifer Rondeau - company: Stripe - github: carolynvs name: Carolyn Van Slyck - company: Microsoft - github: jdumars name: Jaice Singer DuMars - company: Apple - - github: tashimi - name: Tasha Drew - company: VMware + - github: parispittman + name: Paris Pittman meetings: [] contact: private_mailing_list: conduct@kubernetes.io |