Merge conflict detected by MOM on debian/patches/99_linux_2.6_compat.patch This is because the patched file keepalived/vrrp/vrrp_arp.c slightly changed, changing the context of the patch
The DEBIAN version of the patch is OK -> DEBIAN version has been taken for 1.1.15-1ubuntu1 -- Please merge keepalived 1.1.15-1 (main) from Debian unstable (main) https://bugs.launchpad.net/bugs/179922 You received this bug notification because you are a member of Ubuntu Bugs, which is the bug contact for Ubuntu. -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
