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/2024.1] [ATMOSPHERE-188] feat: support SQLAlchemy 2.0 #2119

Open
vexxhost-bot opened this issue Nov 13, 2024 · 0 comments
Open

[stable/2024.1] [ATMOSPHERE-188] feat: support SQLAlchemy 2.0 #2119

vexxhost-bot opened this issue Nov 13, 2024 · 0 comments
Assignees

Comments

@vexxhost-bot
Copy link
Collaborator

Manual cherrypick required.

#1622 failed to apply on top of branch "stable/2024.1":

Applying: feat: support SQLAlchemy 2.0
Using index info to reconstruct a base tree...
M	.charts.yml
M	charts/barbican/requirements.lock
M	charts/ceph-provisioners/requirements.lock
M	charts/cinder/requirements.lock
M	charts/designate/requirements.lock
M	charts/glance/requirements.lock
M	charts/heat/requirements.lock
M	charts/horizon/requirements.lock
M	charts/keystone/requirements.lock
M	charts/libvirt/requirements.lock
M	charts/magnum/requirements.lock
M	charts/manila/requirements.lock
M	charts/memcached/requirements.lock
M	charts/neutron/requirements.lock
M	charts/nova/requirements.lock
M	charts/octavia/requirements.lock
M	charts/openvswitch/requirements.lock
M	charts/ovn/requirements.lock
M	charts/placement/requirements.lock
M	charts/tempest/requirements.lock
Falling back to patching base and 3-way merge...
Auto-merging charts/tempest/requirements.lock
CONFLICT (content): Merge conflict in charts/tempest/requirements.lock
Auto-merging charts/placement/requirements.lock
CONFLICT (content): Merge conflict in charts/placement/requirements.lock
Auto-merging charts/ovn/requirements.lock
CONFLICT (content): Merge conflict in charts/ovn/requirements.lock
Auto-merging charts/openvswitch/requirements.lock
CONFLICT (content): Merge conflict in charts/openvswitch/requirements.lock
Auto-merging charts/octavia/requirements.lock
CONFLICT (content): Merge conflict in charts/octavia/requirements.lock
Auto-merging charts/nova/requirements.lock
CONFLICT (content): Merge conflict in charts/nova/requirements.lock
Auto-merging charts/neutron/requirements.lock
CONFLICT (content): Merge conflict in charts/neutron/requirements.lock
Auto-merging charts/memcached/requirements.lock
CONFLICT (content): Merge conflict in charts/memcached/requirements.lock
Auto-merging charts/manila/requirements.lock
CONFLICT (content): Merge conflict in charts/manila/requirements.lock
Auto-merging charts/magnum/requirements.lock
CONFLICT (content): Merge conflict in charts/magnum/requirements.lock
Auto-merging charts/libvirt/requirements.lock
CONFLICT (content): Merge conflict in charts/libvirt/requirements.lock
Auto-merging charts/keystone/requirements.lock
CONFLICT (content): Merge conflict in charts/keystone/requirements.lock
Auto-merging charts/horizon/requirements.lock
CONFLICT (content): Merge conflict in charts/horizon/requirements.lock
Auto-merging charts/heat/requirements.lock
CONFLICT (content): Merge conflict in charts/heat/requirements.lock
Auto-merging charts/glance/requirements.lock
CONFLICT (content): Merge conflict in charts/glance/requirements.lock
Auto-merging charts/designate/requirements.lock
CONFLICT (content): Merge conflict in charts/designate/requirements.lock
Auto-merging charts/cinder/requirements.lock
CONFLICT (content): Merge conflict in charts/cinder/requirements.lock
Auto-merging charts/ceph-provisioners/requirements.lock
CONFLICT (content): Merge conflict in charts/ceph-provisioners/requirements.lock
Auto-merging charts/barbican/requirements.lock
CONFLICT (content): Merge conflict in charts/barbican/requirements.lock
Auto-merging .charts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat: support SQLAlchemy 2.0
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

2 participants