[ovs-build] Errored: openvswitch/ovs#7890 (branch-2.9 - 2eed9bd)

[Travis CI]

Build Update for openvswitch/ovs
-------------------------------------

Build: #7890
Status: Errored

Duration: 1 hr, 45 mins, and 40 secs
Commit: 2eed9bd (branch-2.9)
Author: David Marchand
Message: vagrant: fix merge conflict

Fix merge conflict introduced when backporting the original commit
253e4dc0683b ("conntrack: fix tcp seq adjustments when mangling
commands.")

Fixes: addbb52274ae ("conntrack: fix tcp seq adjustments when mangling commands.")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>

View the changeset: https://github.com/openvswitch/ovs/compare/909c89b84284...2eed9bdfc86d

View the full build log and details: https://travis-ci.org/openvswitch/ovs/builds/499415495?utm_medium=notification&utm_source=email

--

You can unsubscribe from build emails from the openvswitch/ovs repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=2143550&utm_medium=notification&utm_source=email.
Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notification&utm_source=email.
Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openvswitch.org/pipermail/ovs-build/attachments/20190227/4dc16cc2/attachment.html>