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.

Sign up for GitHub

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

Jump to bottom

NAS-124260 / 13.0 / Improved Cautions on Debugs and Personal Information (by AlexKarpov98) #8933

Merged
merged 2 commits into from
Sep 29, 2023
Merged

NAS-124260 / 13.0 / Improved Cautions on Debugs and Personal Information (by AlexKarpov98) #8933

merged 2 commits into from
Sep 29, 2023

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x b3ce3ae31fea70ac1b7c4327aa451349a8b19945
git cherry-pick -x b5d3dfdc3d2df19cba13c742c0b565c09d793778

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 0cace76c015264902c82cf85c59298cb96e341eb

Testing: see ticket

Original PR: #8926
Jira URL: https://ixsystems.atlassian.net/browse/NAS-124260

@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review September 29, 2023 11:34
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner September 29, 2023 11:34
@AlexKarpov98 AlexKarpov98 requested review from RehanY147 and removed request for a team September 29, 2023 11:34
AlexKarpov98
AlexKarpov98 approved these changes Sep 29, 2023
View reviewed changes
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.

backported.

@undsoft undsoft merged commit 5cea37f into truenas/13.0-stable Sep 29, 2023
3 checks passed
@undsoft undsoft deleted the NAS-124260-13.0 branch September 29, 2023 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexKarpov98 AlexKarpov98 AlexKarpov98 approved these changes

@RehanY147 RehanY147 Awaiting requested review from RehanY147 RehanY147 is a code owner automatically assigned from truenas/ui-team

Assignees

@AlexKarpov98 AlexKarpov98

Labels
no-time-tracked
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bugclerk @AlexKarpov98 @undsoft