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-128684 / 24.10 / Wrong Help popup text (by AlexKarpov98) #10032

Merged
merged 3 commits into from
May 7, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented May 6, 2024

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

git reset --hard HEAD~1
git cherry-pick -x 0592e29bf164f203f61e2b198cada733e64d971a
git cherry-pick -x 1655c499647594196b44aea693a670c42dc30949
git cherry-pick -x de3898faa1cf9874dd9ac9dd6b5868a5dc942559

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 2cf2610e00556e75200ede3d0904024ddd06af9f

Original PR: #10025
Jira URL: https://ixsystems.atlassian.net/browse/NAS-128684

@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review May 6, 2024 12:14
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner May 6, 2024 12:14
@AlexKarpov98 AlexKarpov98 requested review from AlexKarpov98 and removed request for a team May 6, 2024 12:14
@AlexKarpov98 AlexKarpov98 enabled auto-merge (squash) May 6, 2024 12:14
Copy link

codecov bot commented May 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.64%. Comparing base (8e5777f) to head (084a807).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10032   +/-   ##
=======================================
  Coverage   73.64%   73.64%           
=======================================
  Files        1508     1508           
  Lines       52802    52802           
  Branches     6306     6306           
=======================================
  Hits        38885    38885           
  Misses      13917    13917           

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

Copy link
Collaborator

@undsoft undsoft left a comment

Choose a reason for hiding this comment

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

Backported

@AlexKarpov98 AlexKarpov98 merged commit 806df0c into master May 7, 2024
10 checks passed
@AlexKarpov98 AlexKarpov98 deleted the NAS-128684-24.10 branch May 7, 2024 06:34
@bugclerk
Copy link
Contributor Author

bugclerk commented May 7, 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 May 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants