Skip to content

Commit

Permalink
Merge branch 'main' into remove-actuated-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
trask authored Nov 7, 2024
2 parents dc2f1ba + 83875fc commit dfa8825
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ SIG-specific GitHub discussions.
|------|--------------|---------------|---------------|-----------------|--------------------------------|
| Maintainer Meeting | Monday at 09:00 PT | [Google Doc](https://docs.google.com/document/d/1_X2CTiDXmxk2JozBNwQ2uP8FfV1rxx9ISE5puHu0yIk) | [#otel-maintainers](https://cloud-native.slack.com/archives/C01NJ7V1KRC) | [calendar-maintainer-meeting](https://groups.google.com/a/opentelemetry.io/g/calendar-maintainer-meeting) | [Morgan McLean](https://github.com/mtwo) |
| Communications (Website, [Documentation](https://opentelemetry.io/docs/), etc.) | Every other Monday at 10:00 PT | [Google Doc](https://docs.google.com/document/d/1wW0jLldwXN8Nptq2xmgETGbGn9eWP8fitvD5njM-xZY) | [#otel-comms](https://cloud-native.slack.com/archives/C02UN96HZH6) | [calendar-comms](https://groups.google.com/a/opentelemetry.io/g/calendar-comms) | [Severin Neumann](https://github.com/svrnm) |
| End-User SIG | Every other Thursday at 10:00 PT | [Google Doc](https://docs.google.com/document/d/1e-UNZA3Tuno9b53RQbe--whUcO0VIXF3P81oXsrBK6g) | [#otel-user-research](https://cloud-native.slack.com/archives/C01RT3MSWGZ) | [calendar-user-research](https://groups.google.com/a/opentelemetry.io/g/calendar-user-research) | [Daniel Gomez Blanco](https://github.com/danielgblanco) |
| End-User SIG | Every other Thursday at 10:00 PT | [Google Doc](https://docs.google.com/document/d/1e-UNZA3Tuno9b53RQbe--whUcO0VIXF3P81oXsrBK6g) | [#otel-sig-end-user](https://cloud-native.slack.com/archives/C01RT3MSWGZ) | [calendar-sig-end-user](https://groups.google.com/a/opentelemetry.io/g/calendar-sig-end-user) | [Daniel Gomez Blanco](https://github.com/danielgblanco) |
| Security | Every other Wednesday at 07:00 PT | [Google Doc](https://docs.google.com/document/d/1P2xejC7lEkOV_Z-8E0oZPXLK5HOnUPNuRqKP0ZQ5fpg) | [#otel-sig-security](https://cloud-native.slack.com/archives/C05A85QC281) | [calendar-sig-security](https://groups.google.com/a/opentelemetry.io/g/calendar-sig-security) | [Juraci Paixão Kröhling](https://github.com/jpkrohling) |
| Project Infrastructure | Wednesday at 08:00 PT | [Google Doc](https://docs.google.com/document/d/1_dTP2XIaZoFjNiipkeMaGJN10NrhS20FiBTTJoQJeVM) | [#otel-project-infra](https://cloud-native.slack.com/archives/C07BPU981PV) | [calendar-project-infra](https://groups.google.com/a/opentelemetry.io/g/calendar-project-infra) | [Austin Parker](https://github.com/austinlparker) |
| Contributor Experience | Monday alternating between 10:00 PT and 17:00 UTC+8 | [Google Doc](https://docs.google.com/document/d/1CTQI0p3QF8JP8reV8z_ggcs8KE5YVPpQGvAQknw4qP0) | [#otel-contributor-experience](https://cloud-native.slack.com/archives/C06TMJ2R0SK) | [calendar-contributor-experience](https://groups.google.com/a/opentelemetry.io/g/calendar-contributor-experience) | [Juraci Paixão Kröhling](https://github.com/jpkrohling) |
Expand Down
3 changes: 2 additions & 1 deletion docs/how-to-handle-public-calendar.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,6 @@ All recurring meetings are listed in the [Community repo's README](../README.md#
## Zoom bombing prevention

All meetings are created by Zoom with randomized passcodes, which are embedded into the shared calendar links.
All members of <[email protected]> have access to [this document](https://docs.google.com/document/d/1gt9ctxKGPrM_XTINqLgkSxYypdrczHkt2znjwgBU4UU/edit#)
All members of [[email protected]](https://groups.google.com/a/opentelemetry.io/g/calendar-edit-permission)
have access to [this document](https://docs.google.com/document/d/1gt9ctxKGPrM_XTINqLgkSxYypdrczHkt2znjwgBU4UU/edit#)
listing the host keys for our meetings and explaining how to deal with inappropriate behavior in Zoom.
4 changes: 2 additions & 2 deletions sigs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -653,9 +653,9 @@
value: 1e-UNZA3Tuno9b53RQbe--whUcO0VIXF3P81oXsrBK6g
chat:
- type: slack
name: '#otel-user-research'
name: '#otel-sig-end-user'
id: C01RT3MSWGZ
invites: calendar-user-research
invites: calendar-sig-end-user
sponsors: []
gcLiaison:
- name: Daniel Gomez Blanco
Expand Down

0 comments on commit dfa8825

Please sign in to comment.