Skip to content

Commit de5fa62

Browse files
Merge branch 'kubernetes:master' into patch-3
2 parents 38c1e81 + 62b16d1 commit de5fa62

File tree

134 files changed

+2775
-639
lines changed

Some content is hidden

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

134 files changed

+2775
-639
lines changed

OWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
approvers:
4-
- alisondy
54
- cblecker
65
- idvoretskyi
76
- jdumars
@@ -11,6 +10,7 @@ approvers:
1110
- sig-contributor-experience-leads
1211
- committee-steering
1312
emeritus_approvers:
13+
- alisondy
1414
- castrojo
1515
- calebamiles
1616
- grodrigues3

OWNERS_ALIASES

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ aliases:
3535
- neolit123
3636
- vincepri
3737
sig-contributor-experience-leads:
38-
- alisondy
3938
- cblecker
4039
- jberkus
4140
- mrbobbytables
@@ -94,7 +93,10 @@ aliases:
9493
sig-testing-leads:
9594
- BenTheElder
9695
- alvaroaleman
96+
- aojea
9797
- cjwagner
98+
- michelle192837
99+
- pohly
98100
- spiffxp
99101
- stevekuznetsov
100102
sig-ui-leads:
@@ -149,10 +151,10 @@ aliases:
149151
- mylesagray
150152
- phenixblue
151153
committee-code-of-conduct:
154+
- detiber
152155
- endocrimes
153156
- hlipsig
154157
- jeremyrickard
155-
- palnabarun
156158
- salaxander
157159
committee-security-response:
158160
- cjcullen
@@ -163,12 +165,12 @@ aliases:
163165
- tabbysable
164166
- tallclair
165167
committee-steering:
168+
- BenTheElder
166169
- cblecker
167-
- dims
170+
- cpanato
168171
- justaugustus
169-
- liggitt
170172
- mrbobbytables
171-
- parispittman
173+
- palnabarun
172174
- tpepper
173175
## BEGIN CUSTOM CONTENT
174176
provider-aws:

0 commit comments

Comments
 (0)