Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Fri, 20 Aug 2010 18:04:59 +0000 (11:04 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 20 Aug 2010 18:04:59 +0000 (11:04 -0700)
commit7b9bbb8c896777a02b9a3827603c0f5368c8929e
tree189e1d445f7fc2aebd920a6e384cfa9b80326513
parenta112265c8b32101f74815398295d054da1714e21
parent28eec6e50c32c7e848835232aa321ad8fa30d987
Merge "master" into "wdp".
19 files changed:
datapath/flow.c
include/openflow/nicira-ext.h
lib/automake.mk
lib/flow.c
lib/hmap.h
lib/learning-switch.c
lib/packets.h
lib/vlog-modules.def
lib/xfif-netdev.c
lib/xflow-util.c
lib/xflow-util.h
ofproto/ofproto.c
ofproto/ofproto.h
ofproto/wdp-xflow.c
tests/automake.mk
tests/test-flows.c
utilities/ovs-openflowd.8.in
utilities/ovs-openflowd.c
vswitchd/bridge.c