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-132767 / 24.10.1 / Fix payload for cloud sync task (by denysbutenko) #11148

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Dec 5, 2024

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

git reset --hard HEAD~1
git cherry-pick -x c370f4eb2df4e3e4b3b439c90be48f8354aa2782
git cherry-pick -x 063dadba9f3ed39dcc067b17063f44a72b3c24e1
git cherry-pick -x c8972fae48b194d7a5c3ab97db347108f972cf28

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 373844d8f3c3e04d9fccb95417ca497e2abc2894

Changes:

Fix payload for cloud sync task

Testing:

Check details in ticket.

Original PR: #11133
Jira URL: https://ixsystems.atlassian.net/browse/NAS-132767

@denysbutenko denysbutenko marked this pull request as ready for review December 5, 2024 15:03
@denysbutenko denysbutenko requested a review from a team as a code owner December 5, 2024 15:03
@denysbutenko denysbutenko requested review from AlexKarpov98 and removed request for a team December 5, 2024 15:03
Copy link
Member

@denysbutenko denysbutenko left a comment

Choose a reason for hiding this comment

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

backported

Copy link

codecov bot commented Dec 5, 2024

Codecov Report

Attention: Patch coverage is 83.33333% with 2 lines in your changes missing coverage. Please review.

Please upload report for BASE (release/24.10.1@8df9c74). Learn more about missing BASE report.

Files with missing lines Patch % Lines
...what-and-when/cloudsync-what-and-when.component.ts 83.33% 2 Missing ⚠️
Additional details and impacted files
@@                Coverage Diff                 @@
##             release/24.10.1   #11148   +/-   ##
==================================================
  Coverage                   ?   79.97%           
==================================================
  Files                      ?     1571           
  Lines                      ?    51434           
  Branches                   ?     5936           
==================================================
  Hits                       ?    41135           
  Misses                     ?    10299           
  Partials                   ?        0           

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

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.

@denysbutenko denysbutenko merged commit 0bdeedc into release/24.10.1 Dec 5, 2024
9 checks passed
@denysbutenko denysbutenko deleted the NAS-132767-24.10.1 branch December 5, 2024 17:15
@bugclerk
Copy link
Contributor Author

bugclerk commented Dec 5, 2024

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 5, 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.

3 participants