Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the OpenTelemetry SDK version to 1.37.0 in 1.x branch #11118

Merged
merged 4 commits into from
Apr 12, 2024

Conversation

laurit
Copy link
Contributor

@laurit laurit commented Apr 12, 2024

No description provided.

@laurit laurit requested a review from a team April 12, 2024 10:49
@github-actions github-actions bot requested a review from theletterf April 12, 2024 10:49
@zeitlinger
Copy link
Member

Isn't that effort a bit excessive? There must have been many merge conflicts.

@laurit
Copy link
Contributor Author

laurit commented Apr 12, 2024

Isn't that effort a bit excessive? There must have been many merge conflicts.

There were 11 merge conflicts. 5 of these were because the original PR modified files that are not present in release/v1.33.x branch, one for licenses file and the remaining 5 were in build scripts. None of the conflicts was difficult to resolve.

@laurit laurit merged commit e2aa388 into open-telemetry:release/v1.33.x Apr 12, 2024
46 of 47 checks passed
@laurit laurit deleted the otel-sdk-1.37 branch April 12, 2024 11:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants