[ovs-git] Open vSwitch: Fix bugs lingering from merge mistakes. (next)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, next has been updated
       via  e16b024e1b68b2b1c616cb5faa8f5f640e74861a (commit)
      from  8dd5089e2ba60908864931cbbbcad7d281e24d34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e16b024e1b68b2b1c616cb5faa8f5f640e74861a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e16b024e1b68b2b1c616cb5faa8f5f640e74861a
Author: Ben Pfaff <blp at nicira.com>
		
Fix bugs lingering from merge mistakes.
		
I should have caught these when I did the merge from "master" earlier
today, but I forgot to run the testsuite.


-----------------------------------------------------------------------

Summary of changes:
 lib/ofp-util.c     |   39 ++++++++++++++++++++-------------------
 tests/ofproto.at   |    1 -
 tests/ovs-ofctl.at |    9 +++++----
 3 files changed, 25 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
Open vSwitch