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-133954 / 25.04-RC.1 / Fix keychaincredentials schema errors (by themylogin) #15627

Merged
merged 1 commit into from
Feb 7, 2025

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Feb 7, 2025

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

git reset --hard HEAD~1
git cherry-pick -x fac029c263a5251f1ef14ab1fbc51d675905cecf

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 b69661c36a1547b8582f0690cad2dcf769784325

Original PR: #15617
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133954

(cherry picked from commit fac029c)
@themylogin themylogin force-pushed the NAS-133954-25.04-RC.1 branch from 6f4460b to 07c8abb Compare February 7, 2025 08:57
@themylogin themylogin marked this pull request as ready for review February 7, 2025 08:57
@yocalebo yocalebo merged commit 931a360 into stable/fangtooth Feb 7, 2025
1 check passed
@yocalebo yocalebo deleted the NAS-133954-25.04-RC.1 branch February 7, 2025 11:40
@bugclerk
Copy link
Contributor Author

bugclerk commented Feb 7, 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 Feb 7, 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