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

NAS-133139 / 24.10.2 / Replication has started spam (by AlexKarpov98) #11238

Merged
merged 2 commits into from
Dec 26, 2024

Conversation

bugclerk
Copy link
Contributor

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x ee8f3d372db4b6fe952ebc486f2343568d142060
git cherry-pick -x 2f67ca3210e94948f40124cca7c8832415cba7cc
git cherry-pick -x f2a2ee71639dedeaf138b816b1099fdd2b8ff8c3

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x 58271c63e100f4359c9974dd2b48806f171456de

Code review should be enough.

Original PR: #11224
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133139

@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review December 26, 2024 11:49
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner December 26, 2024 11:49
@AlexKarpov98 AlexKarpov98 requested review from bvasilenko and removed request for a team December 26, 2024 11:49
Copy link
Contributor

@AlexKarpov98 AlexKarpov98 left a comment

Choose a reason for hiding this comment

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

ported.

@AlexKarpov98 AlexKarpov98 removed the request for review from bvasilenko December 26, 2024 11:49
Copy link

codecov bot commented Dec 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (stable/electriceel@052e9d4). Learn more about missing BASE report.

Additional details and impacted files
@@                  Coverage Diff                  @@
##             stable/electriceel   #11238   +/-   ##
=====================================================
  Coverage                      ?   79.97%           
=====================================================
  Files                         ?     1573           
  Lines                         ?    51506           
  Branches                      ?     5946           
=====================================================
  Hits                          ?    41194           
  Misses                        ?    10312           
  Partials                      ?        0           

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

@AlexKarpov98 AlexKarpov98 merged commit e673b20 into stable/electriceel Dec 26, 2024
7 checks passed
@AlexKarpov98 AlexKarpov98 deleted the NAS-133139-24.10.2 branch December 26, 2024 12:23
@bugclerk
Copy link
Contributor Author

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Dec 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants