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] feat: add ovn_network_logging_parser support #1559

Closed
vexxhost-bot opened this issue Jul 11, 2024 · 0 comments · Fixed by #1565
Closed

[stable/zed] feat: add ovn_network_logging_parser support #1559

vexxhost-bot opened this issue Jul 11, 2024 · 0 comments · Fixed by #1565
Assignees

Comments

@vexxhost-bot
Copy link
Collaborator

Manual cherrypick required.

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

Applying: feat: add ovn_network_logging_parser support
.git/rebase-apply/patch:334: trailing whitespace.
 
.git/rebase-apply/patch:352: trailing whitespace.
 
.git/rebase-apply/patch:432: trailing whitespace.
 
.git/rebase-apply/patch:496: trailing whitespace.
 
.git/rebase-apply/patch:519: trailing whitespace.
 
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	images/neutron/Dockerfile
M	roles/defaults/vars/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/defaults/vars/main.yml
Auto-merging images/neutron/Dockerfile
CONFLICT (content): Merge conflict in images/neutron/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 feat: add ovn_network_logging_parser support
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

Successfully merging a pull request may close this issue.

3 participants