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

[stable/zed] [ATMOSPHERE-327] images(python-openstackclient): Add python-ironicclient #1723

Closed
vexxhost-bot opened this issue Jul 30, 2024 · 0 comments
Assignees

Comments

@vexxhost-bot
Copy link
Collaborator

Manual cherrypick required.

#1718 failed to apply on top of branch "stable/zed":

Applying: images(python-openstackclient): Add python-ironicclient
Using index info to reconstruct a base tree...
M	images/python-openstackclient/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging images/python-openstackclient/Dockerfile
CONFLICT (content): Merge conflict in images/python-openstackclient/Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 images(python-openstackclient): Add python-ironicclient
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants