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

[chore] Merge release/v0.102.x into main replacement #10328

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Jun 5, 2024

Replacement of #10327 following step 4:

If you see merge conflicts when creating the pull request, do the following:
Create a new branch from origin:main.
Merge the release/ branch into the new branch.
Resolve the conflicts.
Create another pull request to the main branch from the new branch to replace the pull request from the release/ branch.

mx-psi and others added 3 commits June 5, 2024 15:48
…metry#10325)

Backport of open-telemetry#10321

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
…n-telemetry#10324)

Backport of open-telemetry#10323

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Copy link

codecov bot commented Jun 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.58%. Comparing base (760f773) to head (2430edb).

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #10328   +/-   ##
=======================================
  Coverage   92.58%   92.58%           
=======================================
  Files         387      387           
  Lines       18254    18254           
=======================================
  Hits        16900    16900           
  Misses       1008     1008           
  Partials      346      346           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@evan-bradley evan-bradley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand why there are no changes, but based on the commits this looks good to me.

It does seem like it's missing the 0.102.1 release, but I think that can be done in a follow-up.

@mx-psi
Copy link
Member Author

mx-psi commented Jun 5, 2024

Not sure I understand why there are no changes, but based on the commits this looks good to me.

This is to get the same commit SHA on main as we have on the release/v0.102.x. The contents of all the commits are already on main, so the actual diff is nil.

It does seem like it's missing the 0.102.1 release, but I think that can be done in a follow-up.

This may actually be important I think :/ let me double check

@mx-psi
Copy link
Member Author

mx-psi commented Jun 5, 2024

(Please don't merge this yet even if you have permissions, I am checking the builder thing)

@mx-psi
Copy link
Member Author

mx-psi commented Jun 5, 2024

Need to redo the PR, sorry :(

@mx-psi
Copy link
Member Author

mx-psi commented Jun 5, 2024

Replaced by #10329, it was missing 7218b4c indeed

@mx-psi mx-psi deleted the mx-psi/release/v0.102.x-fix-merge-conflicts branch June 5, 2024 14:35
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.

None yet

4 participants