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

incus/storage: Add yaml support for storage create #775

Merged
merged 2 commits into from
Apr 20, 2024

Conversation

awalvie
Copy link
Contributor

@awalvie awalvie commented Apr 20, 2024

Part of #741

@awalvie awalvie requested a review from stgraber as a code owner April 20, 2024 15:20
@stgraber stgraber force-pushed the add-yaml-support-for-storage-create branch from ac5c734 to 328081a Compare April 20, 2024 18:45
@awalvie
Copy link
Contributor Author

awalvie commented Apr 20, 2024

Thank you for the rebase! How do you go about doing it when there are conflicts?

@stgraber stgraber merged commit 88a4253 into lxc:main Apr 20, 2024
24 of 25 checks passed
@stgraber
Copy link
Member

I do a git rebase against the main branch and when I hit the commit I either manually solve it or in the case of auto-generated commits like i18n, I just discard its content and regenerate it.

@awalvie awalvie changed the title Add yaml support for storage create incus/storage: Add yaml support for storage create Apr 23, 2024
tomponline added a commit to canonical/lxd that referenced this pull request Sep 3, 2024
cherry-picked from: lxc/incus#786
cherry-picked from: lxc/incus#782
cherry-picked from: lxc/incus#778
cherry-picked from: lxc/incus#775
cherry-picked from: lxc/incus#767
cherry-picked from: lxc/incus#863
cherry-picked from: lxc/incus#864
cherry-picked from: lxc/incus#891
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants