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-124569 / 13.0 / Rename ES102S to ES102G2 (UI) (by AlexKarpov98) #9051

Merged
merged 3 commits into from
Oct 17, 2023
Merged

NAS-124569 / 13.0 / Rename ES102S to ES102G2 (UI) (by AlexKarpov98) #9051

merged 3 commits into from
Oct 17, 2023

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 57a4f6cd2d87c4f3c2e646c7ab6f71715242e938
git cherry-pick -x e7848ce56bd06ba3bc32a1a527ab372ec0590687

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 c20a7c63eb80264c28c4764915fd918cd2452a6f

Testing: see ticket

Original PR: #9033
Jira URL: https://ixsystems.atlassian.net/browse/NAS-124569

@AlexKarpov98 AlexKarpov98 self-assigned this Oct 15, 2023
@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review October 16, 2023 12:11
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner October 16, 2023 12:11
@AlexKarpov98 AlexKarpov98 requested review from AlexKarpov98 and removed request for a team October 16, 2023 12:11
AlexKarpov98
AlexKarpov98 approved these changes Oct 16, 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 d504629 into truenas/13.0-stable Oct 17, 2023
3 checks passed
@undsoft undsoft deleted the NAS-124569-13.0 branch October 17, 2023 07:43
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

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