Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Tue, 31 Aug 2010 17:41:00 +0000 (10:41 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 31 Aug 2010 17:41:00 +0000 (10:41 -0700)
commitd90c986fefa7f171b49e9130dad7d7b9c943ee58
tree31e026883609ff5bfce657ca3e8c64af422a7828
parent682c44b286d7e4622d56b52076756733747b9bb4
parent33e6617792d122d47f2a2b9cff73f41cf58d45c6
Merge "master" into "wdp".
44 files changed:
datapath/Modules.mk
datapath/actions.c
datapath/actions.h
datapath/datapath.c
datapath/datapath.h
datapath/dp_notify.c
datapath/dp_sysfs_dp.c
datapath/dp_sysfs_if.c
datapath/flow.c
datapath/flow.h
datapath/vport-netdev.c
datapath/vport.c
datapath/vport.h
include/openflow/nicira-ext.h
include/openvswitch/automake.mk
include/openvswitch/xflow.h
lib/automake.mk
lib/classifier.c
lib/flow.c
lib/flow.h
lib/learning-switch.c
lib/netdev-provider.h
lib/netdev-tunnel.c
lib/netdev-vport.c
lib/netdev.c
lib/ofp-print.c
lib/ofp-util.c
lib/packets.h
lib/svec.c
lib/svec.h
lib/vlog-modules.def
lib/xfif-netdev.c
lib/xfif-provider.h
lib/xfif.c
lib/xfif.h
ofproto/discovery.c
ofproto/in-band.c
ofproto/in-band.h
ofproto/ofproto.c
ofproto/pktbuf.c
ofproto/wdp-xflow.c
tests/automake.mk
utilities/ovs-ofctl.c
vswitchd/bridge.c