Skip to content

Commit

Permalink
Merge branch 'main' into shipping-service-set-rpc-attrs
Browse files Browse the repository at this point in the history
  • Loading branch information
mottibec committed Jul 31, 2024
2 parents cf4d356 + 030241f commit 7a6d0a4
Show file tree
Hide file tree
Showing 4 changed files with 170 additions and 154 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ What do you expect to see?

**What is the actual behavior?**

What did you see instead?
Please describe the actual behavior experienced.

## Reproduce

Provide the minimum required steps to result in the issue you're observing.
Could you provide the minimum required steps to resolve the issue you're seeing?

We will close this issue if:

Expand All @@ -35,4 +35,4 @@ We will close this issue if:

## Additional Context

Add any other context about the problem here.
Please feel free to add any other context about the problem here.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ If so, provide a concise description of the problem.

**Describe the solution you'd like:**

What do you want to happen instead? What is the expected behavior?
What would you like to happen instead? What is the expected behavior?

**Describe alternatives you've considered.**

Which alternative solutions or features have you considered?

## Additional Context

Add any other context about the feature request here.
Feel free to add any other context about the feature request here.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Please provide a brief description of the changes here.

## Merge Requirements

For new features contributions please make sure you have completed the following
For new features contributions, please make sure you have completed the following
essential items:

* [ ] `CHANGELOG.md` updated to document new feature additions
Expand All @@ -17,7 +17,7 @@ update in docs. Please make sure to update the opentelemetry.io repo with any
docs changes.
A Pull Request that modifies docker-compose.yaml, otelcol-config.yaml, or
Grafana dashboards, will likely require an update to the Demo Helm chart.
Grafana dashboards will likely require an update to the Demo Helm chart.
Other changes affecting how a service is deployed will also likely require an
update to the Demo Helm chart.
-->
Expand Down
Loading

0 comments on commit 7a6d0a4

Please sign in to comment.