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

Prepare to rename master to main #3420

Merged
merged 3 commits into from
Dec 1, 2021
Merged

Prepare to rename master to main #3420

merged 3 commits into from
Dec 1, 2021

Conversation

jpkrohling
Copy link
Contributor

Signed-off-by: Juraci Paixão Kröhling juraci@kroehling.de

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
@jpkrohling jpkrohling requested a review from a team as a code owner December 1, 2021 14:41
@codecov
Copy link

codecov bot commented Dec 1, 2021

Codecov Report

Merging #3420 (474099a) into master (398f096) will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3420      +/-   ##
==========================================
- Coverage   96.50%   96.48%   -0.03%     
==========================================
  Files         261      261              
  Lines       15267    15267              
==========================================
- Hits        14734    14730       -4     
- Misses        451      454       +3     
- Partials       82       83       +1     
Impacted Files Coverage Δ
cmd/query/app/static_handler.go 95.80% <0.00%> (-1.20%) ⬇️
...lugin/sampling/strategystore/adaptive/processor.go 99.38% <0.00%> (-0.62%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 398f096...474099a. Read the comment docs.

Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

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

Similar question to the other repos. Is there a reason to keep functionality for both master and main? Is that just something we want during a transition period?

README.md Outdated Show resolved Hide resolved
@jpkrohling
Copy link
Contributor Author

Is that just something we want during a transition period?

Once we switch completely to main, I'll send another PR removing master from the CI files.

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
joe-elliott
joe-elliott previously approved these changes Dec 1, 2021
@joe-elliott
Copy link
Member

There are a lot of references to jaegertracing/jaeger-ui/blob/master/... in the changelog. Should this be updated to use main?

@jpkrohling
Copy link
Contributor Author

There are a lot of references to jaegertracing/jaeger-ui/blob/master/... in the changelog. Should this be updated to use main?

GitHub sets a redirect, we should be fine for the old ones. For the new ones, we should use the new branch name. Although it wouldn't be hard to rename it as part of this PR...

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

Changelog changed.

@jpkrohling jpkrohling merged commit 7872d1b into jaegertracing:master Dec 1, 2021
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

2 participants