Skip to content

Commit

Permalink
Merge branch 'main' into bug/1692
Browse files Browse the repository at this point in the history
  • Loading branch information
mviitane committed Aug 13, 2024
2 parents d4e5077 + 8ea2091 commit 08742a2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

Welcome to OpenTelemetry Demo Webstore repository!

Before you start - see OpenTelemetry general
[contributing](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
requirements and recommendations.
Before you start - see OpenTelemetry
[Contributor Guide](https://github.com/open-telemetry/community/blob/main/guides/contributor/README.md)
for details on code attribution.

## Join a SIG Call

Expand Down Expand Up @@ -167,9 +167,9 @@ Open a pull request against the main `opentelemetry-demo` repo.
A PR is considered to be **ready to merge** when:

- It has received approval from
[Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
[Approvers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver)
/
[Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
[Maintainers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
- Major feedbacks are resolved.
- It has been open for review for at least one working day. This gives people
reasonable time to review.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ Monday at 8:30 AM PST and anyone is welcome.

## Project leadership

[Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
[Maintainers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer)
([@open-telemetry/demo-maintainers](https://github.com/orgs/open-telemetry/teams/demo-maintainers)):

- [Juliano Costa](https://github.com/julianocosta89), Datadog
- [Mikko Viitanen](https://github.com/mviitane), Dynatrace
- [Pierre Tessier](https://github.com/puckpuck), Honeycomb

[Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
[Approvers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver)
([@open-telemetry/demo-approvers](https://github.com/orgs/open-telemetry/teams/demo-approvers)):

- [Cedric Ziel](https://github.com/cedricziel) Grafana Labs
Expand Down

0 comments on commit 08742a2

Please sign in to comment.