Skip to content

Commit 969ea7d

Browse files
authored
Merge pull request #8355 from endocrimes/dani/cocc-2025
cocc: Update for 2025 election
2 parents 73e8805 + 188e7da commit 969ea7d

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

OWNERS_ALIASES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ aliases:
157157
- pohly
158158
committee-code-of-conduct:
159159
- AnaMMedina21
160+
- divya-mohan0209
160161
- endocrimes
161-
- hlipsig
162162
- jeremyrickard
163-
- salaxander
163+
- stmcginnis
164164
committee-security-response:
165165
- SaranBalaji90
166166
- cjcullen

committee-code-of-conduct/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
1515
## Members
1616

1717
* Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Upbound
18-
* Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent
19-
* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), Red Hat
18+
* Divya Mohan (**[@divya-mohan0209](https://github.com/divya-mohan0209)**), SUSE
19+
* Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Fermyon
2020
* Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft
21-
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Independent
21+
* Sean McGinnis (**[@stmcginnis](https://github.com/stmcginnis)**), Lambda, Inc
2222

2323
## Emeritus Members
2424

@@ -29,10 +29,12 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
2929
* Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**)
3030
* Jason DeTiberus (**[@detiber](https://github.com/detiber)**)
3131
* Eric Paris (**[@eparis](https://github.com/eparis)**)
32+
* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**)
3233
* Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**)
3334
* Karen Chu (**[@karenhchu](https://github.com/karenhchu)**)
3435
* Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**)
3536
* Paris Pittman (**[@parispittman](https://github.com/parispittman)**)
37+
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**)
3638
* Tasha Drew (**[@tashimi](https://github.com/tashimi)**)
3739
* Tim Pepper (**[@tpepper](https://github.com/tpepper)**)
3840
* Vallery Lancey (**[@vllry](https://github.com/vllry)**)

sig-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
7474

7575
| Name | Label | Members | Contact |
7676
|------|--------|---------|---------|
77-
|[Code of Conduct](committee-code-of-conduct/README.md)|[code-of-conduct](https://github.com/kubernetes/kubernetes/labels/committee%2Fcode-of-conduct)|* [Ana Margarita Medina](https://github.com/AnaMMedina21), Upbound<br>* [Danielle Lancashire](https://github.com/endocrimes), Independent<br>* [Hilliary Lipsig](https://github.com/hlipsig), Red Hat<br>* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft<br>* [Xander Grzywinski](https://github.com/salaxander), Independent<br>|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)<br>* [Private Mailing List]([email protected])
77+
|[Code of Conduct](committee-code-of-conduct/README.md)|[code-of-conduct](https://github.com/kubernetes/kubernetes/labels/committee%2Fcode-of-conduct)|* [Ana Margarita Medina](https://github.com/AnaMMedina21), Upbound<br>* [Divya Mohan](https://github.com/divya-mohan0209), SUSE<br>* [Danielle Lancashire](https://github.com/endocrimes), Fermyon<br>* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft<br>* [Sean McGinnis](https://github.com/stmcginnis), Lambda, Inc<br>|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)<br>* [Private Mailing List]([email protected])
7878
|[Security Response](committee-security-response/README.md)|[security-response](https://github.com/kubernetes/kubernetes/labels/committee%2Fsecurity-response)|* [Sri Saran Balaji](https://github.com/SaranBalaji90), Amazon<br>* [CJ Cullen](https://github.com/cjcullen), Google<br>* [Craig Ingram](https://github.com/cji), Google<br>* [Mo Khan](https://github.com/enj), Microsoft<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Rita Zhang](https://github.com/ritazh), Microsoft<br>* [Tabitha Sable](https://github.com/tabbysable), Datadog<br>|* [Private Mailing List]([email protected])
7979
|[Steering](committee-steering/README.md)|[steering](https://github.com/kubernetes/kubernetes/labels/committee%2Fsteering)|* [Benjamin Elder](https://github.com/BenTheElder), Google<br>* [Antonio Ojea](https://github.com/aojea), Google<br>* [Stephen Augustus](https://github.com/justaugustus), Bloomberg<br>* [Paco Xu 徐俊杰](https://github.com/pacoxu), DaoCloud<br>* [Patrick Ohly](https://github.com/pohly), Intel<br>* [Sascha Grunert](https://github.com/saschagrunert), Red Hat<br>* [Maciej Szulik](https://github.com/soltysh), Defense Unicorns<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]([email protected])
8080
<!-- BEGIN CUSTOM CONTENT -->

sigs.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3872,18 +3872,18 @@ committees:
38723872
- github: AnaMMedina21
38733873
name: Ana Margarita Medina
38743874
company: Upbound
3875+
- github: divya-mohan0209
3876+
name: Divya Mohan
3877+
company: SUSE
38753878
- github: endocrimes
38763879
name: Danielle Lancashire
3877-
company: Independent
3878-
- github: hlipsig
3879-
name: Hilliary Lipsig
3880-
company: Red Hat
3880+
company: Fermyon
38813881
- github: jeremyrickard
38823882
name: Jeremy Rickard
38833883
company: Microsoft
3884-
- github: salaxander
3885-
name: Xander Grzywinski
3886-
company: Independent
3884+
- github: stmcginnis
3885+
name: Sean McGinnis
3886+
company: Lambda, Inc
38873887
emeritus_leads:
38883888
- github: AevaOnline
38893889
name: Aeva Black
@@ -3899,6 +3899,8 @@ committees:
38993899
name: Jason DeTiberus
39003900
- github: eparis
39013901
name: Eric Paris
3902+
- github: hlipsig
3903+
name: Hilliary Lipsig
39023904
- github: jdumars
39033905
name: Jaice Singer DuMars
39043906
- github: karenhchu
@@ -3907,6 +3909,8 @@ committees:
39073909
name: Nabarun Pal
39083910
- github: parispittman
39093911
name: Paris Pittman
3912+
- github: salaxander
3913+
name: Xander Grzywinski
39103914
- github: tashimi
39113915
name: Tasha Drew
39123916
- github: tpepper

0 commit comments

Comments
 (0)