[ovs-dev] [branch-2.9] vagrant: fix merge conflict

Darrell Ball dlu998 at gmail.com
Tue Feb 26 17:32:26 UTC 2019


oops

thanks David




On Tue, Feb 26, 2019 at 2:13 AM David Marchand <david.marchand at redhat.com>
wrote:

> 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>
> ---
>  Vagrantfile | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/Vagrantfile b/Vagrantfile
> index d7e38a1..fbd772a 100644
> --- a/Vagrantfile
> +++ b/Vagrantfile
> @@ -21,17 +21,6 @@ $bootstrap_debian = <<SCRIPT
>  aptitude -y update
>  aptitude -y upgrade
>  aptitude -y install -R \
> -<<<<<<< HEAD
> -               build-essential dpkg-dev lintian devscripts fakeroot \
> -               debhelper dh-autoreconf uuid-runtime \
> -               autoconf automake libtool \
> -               python-all python-twisted-core python-twisted-conch \
> -               xdg-utils groff graphviz netcat curl \
> -               wget python-six ethtool \
> -               libcap-ng-dev libssl-dev python-dev openssl \
> -               python-pyftpdlib python-flake8 python-tftpy \
> -               linux-headers-`uname -r`
> -=======
>                  build-essential dpkg-dev lintian devscripts fakeroot \
>                  debhelper dh-autoreconf uuid-runtime \
>                  autoconf automake libtool \
> @@ -42,7 +31,6 @@ aptitude -y install -R \
>                  python-pyftpdlib python-flake8 python-tftpy \
>                  linux-headers-`uname -r` \
>                  lftp
> ->>>>>>> conntrack: fix tcp seq adjustments when mangling commands.
>  SCRIPT
>
>  $bootstrap_centos = <<SCRIPT
> --
> 1.8.3.1
>
>


More information about the dev mailing list