diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2020-06-16 07:20:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 07:20:05 -0700 |
| commit | 94cc1692e9d8939781fdf1e88c5792ba1e08d64b (patch) | |
| tree | d7131cb09a8a6eadeca0f0a0b66bc868270fd22b | |
| parent | eaddc76fd7d5845665cab136eea16d580852dc47 (diff) | |
| parent | 4b27c0786776be9418bcd108f56e941c730212b0 (diff) | |
Merge pull request #4863 from nikhita/update-psc
Update PSC members
| -rw-r--r-- | OWNERS_ALIASES | 2 | ||||
| -rw-r--r-- | committee-product-security/README.md | 2 | ||||
| -rw-r--r-- | sig-list.md | 2 | ||||
| -rw-r--r-- | sigs.yaml | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 77ad0135..52cd6659 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -150,8 +150,8 @@ aliases: - tashimi committee-product-security: - cjcullen + - cji - joelsmith - - liggitt - lukehinds - micahhausler - tallclair diff --git a/committee-product-security/README.md b/committee-product-security/README.md index 036781af..0ae237c5 100644 --- a/committee-product-security/README.md +++ b/committee-product-security/README.md @@ -14,8 +14,8 @@ The Kubernetes Product Security Committee is the body that is responsible for re ## Members * CJ Cullen (**[@cjcullen](https://github.com/cjcullen)**), Google +* Craig Ingram (**[@cji](https://github.com/cji)**), Salesforce * Joel Smith (**[@joelsmith](https://github.com/joelsmith)**), Red Hat -* Jordan Liggitt (**[@liggitt](https://github.com/liggitt)**), Google * Luke Hinds (**[@lukehinds](https://github.com/lukehinds)**), Red Hat * Micah Hausler (**[@micahhausler](https://github.com/micahhausler)**), Amazon * Tim Allclair (**[@tallclair](https://github.com/tallclair)**), Google diff --git a/sig-list.md b/sig-list.md index c257b22e..832e97d7 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), Google<br>* [Tasha Drew](https://github.com/tashimi), 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>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Jordan Liggitt](https://github.com/liggitt), Google<br>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Tim Allclair](https://github.com/tallclair), Google<br>|* [Private Mailing List](security@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>* [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 --> @@ -2822,12 +2822,12 @@ committees: - github: cjcullen name: CJ Cullen company: Google + - github: cji + name: Craig Ingram + company: Salesforce - github: joelsmith name: Joel Smith company: Red Hat - - github: liggitt - name: Jordan Liggitt - company: Google - github: lukehinds name: Luke Hinds company: Red Hat |