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-133894 / 25.04.0 / TrueNAS enterprise hint (by AlexKarpov98) #11661

Merged
merged 5 commits into from
Mar 6, 2025

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Mar 4, 2025

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

git reset --hard HEAD~1
git cherry-pick -x 5f99070d03765c0d2f7e53bdc1d29d4857681a3d
git cherry-pick -x cf514fc8b0061ef15cf2cff5505961fc52a8c379
git cherry-pick -x 7ca49f2ed9ab775fa2afb1ce333ffe73bf9c2e21
git cherry-pick -x fccd60c1ff66829bf025c0f3430acc8e77c1ff1f
git cherry-pick -x aecd0501f69a5e600b7ae914c58af0603f3a887a
git cherry-pick -x f8b126ea733d537c699a920b6927a16196c9ca11
git cherry-pick -x b97d3809c7169ae97907e61f17f10032ce7983e7
git cherry-pick -x aa72ee7eb651cfb1e8fa16eb3b1d4b62513b4bb4
git cherry-pick -x 667ff4878b9498656f1f6b0ac7a6260fcfdf700c
git cherry-pick -x 1e98ebebb152234631fd242f99c61f2787ee7d61

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 f281d7c7ae11fed88bc954b9743edaf733cb8f3e

Testing:
See ticket.

Affects Reasoning
Documentation System Info Widget Updated

Original PR: #11637
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133894

@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review March 5, 2025 17:47
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner March 5, 2025 17:47
@AlexKarpov98 AlexKarpov98 requested review from denysbutenko and removed request for a team March 5, 2025 17:47
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 Mar 5, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (stable/fangtooth@3885332). Learn more about missing BASE report.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@                 Coverage Diff                 @@
##             stable/fangtooth   #11661   +/-   ##
===================================================
  Coverage                    ?   83.08%           
===================================================
  Files                       ?     1655           
  Lines                       ?    59172           
  Branches                    ?     6268           
===================================================
  Hits                        ?    49162           
  Misses                      ?    10010           
  Partials                    ?        0           

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

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

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 enabled auto-merge (squash) March 6, 2025 09:20
@AlexKarpov98 AlexKarpov98 merged commit 04d635f into stable/fangtooth Mar 6, 2025
11 checks passed
@AlexKarpov98 AlexKarpov98 deleted the NAS-133894-25.04.0 branch March 6, 2025 09:44
@bugclerk
Copy link
Contributor Author

bugclerk commented Mar 6, 2025

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 Mar 6, 2025
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.

3 participants