Skip to content

Commit 8a73733

Browse files
Merge pull request #2 from ArangoGutierrez/rebase-play
Rebase
2 parents bf4001c + e74c5c1 commit 8a73733

File tree

48 files changed

+1163
-596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1163
-596
lines changed

OWNERS_ALIASES

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ aliases:
4646
- divya-mohan0209
4747
- natalisucks
4848
- reylejano
49-
- sftim
49+
- salaxander
5050
- tengqm
5151
sig-etcd-leads:
5252
- ahrtr
@@ -119,9 +119,6 @@ aliases:
119119
- jsturtevant
120120
- knabben
121121
- marosset
122-
wg-api-expression-leads:
123-
- apelisse
124-
- kwiesmueller
125122
wg-batch-leads:
126123
- alculquicondor
127124
- mwielgus
@@ -144,6 +141,7 @@ aliases:
144141
- sudermanjr
145142
wg-serving-leads:
146143
- ArangoGutierrez
144+
- Jeffwan
147145
- SergeyKanzhelev
148146
- terrytangyuan
149147
wg-structured-logging-leads:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

committee-code-of-conduct/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
1818
* Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent
1919
* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), Red Hat
2020
* Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft
21-
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Microsoft
21+
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Defense Unicorns
2222

2323
## Emeritus Members
2424

communication/slack-config/channels.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ channels:
321321
- name: litmus-dev
322322
- name: lokomotive
323323
archived: true
324+
- name: lula-dev
324325
- name: magnum-cluster-api
325326
- name: malaysia-users
326327
- name: malta-users

communication/slack-config/usergroups.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,23 +244,22 @@ usergroups:
244244
description: Members of the Cluster API Release Team
245245
members:
246246
- adilGhaffarDev
247-
- adityabhatia
248-
- akshay196
249-
- cahillsf
250247
- chandankumar4
251-
- Dhairya-Arora01
252-
- Fedosin
253-
- mansikulkarni96
254-
- mcbenjemaa
255-
- nawazkh
256-
- ssuriyan7
257-
- SubhasmitaSw
248+
- chiukapoor
249+
- dhij
250+
- hackeramitkumar
251+
- jayesh-srivastava
252+
- kperath
253+
- meatballhat
254+
- Nivedita-coder
255+
- pravarag
256+
- rajankumary2k
257+
- shipra101
258+
- smoshiur1237
258259
- Sunnatillo
259260
- troy0820
260-
- typeid
261-
- VibhorChinda
261+
- vishalanarase
262262
- willie-yao
263-
- yrs147
264263

265264
- name: kcp-devs
266265
long_name: kcp Development Team
@@ -319,6 +318,7 @@ usergroups:
319318
- irbekrm
320319
- sgtcodfish
321320
- inteon
321+
- ThatsMrTalbot
322322

323323
- name: gophercloud-maintainers
324324
long_name: Gophercloud Maintainers

0 commit comments

Comments
 (0)