[ovs-git] [openvswitch/ovs] e25911: vagrant: Add 'nc' to installed programs.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: e259119c199d65e819492b0970f367e157509658
      https://github.com/openvswitch/ovs/commit/e259119c199d65e819492b0970f367e157509658
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M Vagrantfile

  Log Message:
  -----------
  vagrant: Add 'nc' to installed programs.

netcat is used in several tests, but when creating a new vagrant VM we
haven't been installing it. Do so.

Signed-off-by: Joe Stringer <joe at ovn.org>
Tested-by: William Tu <u9012063 at gmail.com>
Acked-by: Andy Zhou <azhou at ovn.org>


  Commit: a5a41e4acbd73afb18a3a3f976ba05607fdebd19
      https://github.com/openvswitch/ovs/commit/a5a41e4acbd73afb18a3a3f976ba05607fdebd19
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M datapath/conntrack.c

  Log Message:
  -----------
  datapath: Drop debug code in handle_fragments().

This piece of debug code was introduced during the backport of
conntrack, but is unnecessary and not upstream. Drop it to bring the
code more inline with upstream.

Reported-by: Jesse Gross <jesse at kernel.org>
Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Jesse Gross <jesse at kernel.org>


Compare: https://github.com/openvswitch/ovs/compare/5c142a1e41fb...a5a41e4acbd7