[ovirt-devel] Re: [CQ]: 111471,2 (ovirt-engine) failed "ovirt-master" system tests
On Thu, Oct 15, 2020 at 10:47 AM Radoslaw Szwajkowski
<rszwajko(a)redhat.com> wrote:
Fixed in https://gerrit.ovirt.org/#/c/111741/
Thanks for the quick patch!
My local build was successful but let wait for the CI +1.
Problem was caused by the conflict between 2 of my patches:
https://gerrit.ovirt.org/#/c/111119/
and
https://gerrit.ovirt.org/#/c/111471/
Each of them passed the CI test but when applied to master the
conflict occurred.
Sorry for that.
NP. Next time, better make up your mind, decide which patch should go
first, and rebase the other on top of it.
You can do this also before merging the first, and then check-patch
should have failed on it.
Best regards,
--
Didi