Merge 'master' into 'next'.
authorBen Pfaff <blp@nicira.com>
Thu, 12 May 2011 19:05:42 +0000 (12:05 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 12 May 2011 19:05:42 +0000 (12:05 -0700)
commit007948177581f3b3dad188221593d0e4bdca6ba0
treef1acdac6058c28a0905f717612e3cb3c84fcea06
parentfc08b7a2397ef0cf55014c1ee159599fb420b73e
parent2db65bf72c008cf7ee658d0b44744b39495ead14
Merge 'master' into 'next'.
28 files changed:
include/openflow/nicira-ext.h
lib/automake.mk
lib/bond.c
lib/bond.h
lib/dpif-linux.c
lib/dpif.c
lib/dpif.h
lib/flow.h
lib/learning-switch.c
lib/netdev-linux.c
lib/ofp-parse.c
lib/ofp-print.c
lib/ofp-util.c
lib/ofp-util.h
ofproto/connmgr.c
ofproto/in-band.c
ofproto/ofproto-dpif.c
ofproto/ofproto.c
ofproto/ofproto.h
ofproto/private.h
tests/ofproto.at
tests/ovs-ofctl.at
utilities/ovs-controller.c
utilities/ovs-ofctl.8.in
utilities/ovs-ofctl.c
utilities/ovs-openflowd.c
vswitchd/bridge.c
vswitchd/ovs-vswitchd.c