search

vexxhost / atmosphere

Simple & easy private cloud platform featuring VMs, Kubernetes & bare-metal
88 stars 23 forks source link

[stable/zed] Start using Tini for Open vSwitch #1470

Closed vexxhost-bot closed 3 months ago

vexxhost-bot commented 3 months ago

Manual cherrypick required.

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

Applying: Add tini to Open vSwitch
Using index info to reconstruct a base tree...
M   images/openvswitch/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging images/openvswitch/Dockerfile
CONFLICT (content): Merge conflict in images/openvswitch/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 Add tini to Open vSwitch
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".