diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2019-04-18 17:55:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 17:55:54 -0700 |
| commit | dde8166cccc65861e3f17b486d8ef28d499bbde4 (patch) | |
| tree | 17e3449ca296118c5ce4a406b7caf5af9caf0c0f | |
| parent | 3045b49137337ada3e8c12d4d498e1a52341a1ab (diff) | |
| parent | 9b257da0a7d54f5e6ee0b0d0a5afda95bcdf1a53 (diff) | |
Merge pull request #3352 from michelleN/cocc
add term info to CoCC
| -rw-r--r-- | committee-code-of-conduct/README.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index fe0f44e0..40286c4f 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -36,13 +36,17 @@ Note that the links to display team membership will only work if you are a membe ## Terms The members and their terms are as follows: -- Jaice Singer Dumars (Google) - 2 years -- Paris Pittman (Google) - 2 years + +### Term ends on August 7, 2019 - Carolyn Van Slyck (Microsoft) - 1 year - Eric Paris (Red Hat) - 1 year - Jennifer Rondeau (Heptio) - 1 year +### Term ends on August 7, 2020 +- Jaice Singer Dumars (Google) - 2 years +- Paris Pittman (Google) - 2 years + Please see the [bootstrapping document](./bootstrapping-process.md) for more information on how members are picked, their responsibilities, and how the committee will initially function. -_More information on how to contact this committee and learn about its process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to <conduct@kubernetes.io>_. +_More information on conflict resolution process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to <conduct@kubernetes.io>_. <!-- END CUSTOM CONTENT --> |