Skip to content

Commit 03adbcf

Browse files
Merge branch 'kubernetes:master' into master
2 parents b784685 + cb6b95f commit 03adbcf

Some content is hidden

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

43 files changed

+567
-74
lines changed

OWNERS_ALIASES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ aliases:
145145
- pohly
146146
- serathius
147147
committee-code-of-conduct:
148-
- detiber
148+
- AnaMMedina21
149149
- endocrimes
150150
- hlipsig
151151
- jeremyrickard

committee-code-of-conduct/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
1414

1515
## Members
1616

17-
* Jason DeTiberus (**[@detiber](https://github.com/detiber)**), Cisco
17+
* Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Lightstep
1818
* Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent
1919
* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), RedHat
2020
* Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft

committee-code-of-conduct/governance/onboarding-offboarding.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ Different actions on this list must be carried out by different members:
1616
- [ ] `#kubernetes-moderators` and `#slack-reports` private channels on `kubernetes.slack.com`
1717
- [ ] Code of conduct sync Slack channel on `cloud-native.slack.com`
1818

19-
### Slack Channel Admin Privileges
20-
21-
**Who executes:** During transition, carryover members initiate promotion/removal by pinging project Slack admins
22-
23-
- [ ] Ping project Slack admins to add/remove Slack admin privileges for incoming/outgoing members in CoCC channel(s)
24-
2519
### Kubernetes/community permissions and google permissions
2620

2721
**Who executes:** Carryover members should ensure that outgoing members are removed and incoming members are invited.
44 KB
Loading
192 KB
Loading
6.27 KB
Loading
22.1 KB
Loading
9.96 KB
Loading
19.3 KB
Loading
22.7 KB
Loading

0 commit comments

Comments
 (0)