Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Thu, 20 May 2010 20:37:37 +0000 (13:37 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 20 May 2010 20:37:37 +0000 (13:37 -0700)
commite20567b044dd19cd0a70b5e0cfdf2bf925739f45
treeda9ee331b790e0f696d42e64d55b83c774023844
parent2eeb6e08decb2dd3e793647a38596950278a1610
parentca247927bd5445e77391ffb98f713b2cd258c017
Merge "master" into "wdp".
58 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/linux-2.6/Modules.mk
datapath/vport-netdev.c
datapath/vport-netdev.h
datapath/vport.c
datapath/vport.h
datapath/xflow-compat.h
include/openvswitch/automake.mk
include/openvswitch/gre.h
include/openvswitch/xflow.h
lib/automake.mk
lib/classifier.c
lib/classifier.h
lib/flow.c
lib/flow.h
lib/netdev-gre.c
lib/netdev-provider.h
lib/netdev.c
lib/netdev.h
lib/ofp-print.c
lib/ofpbuf.c
lib/vconn.c
lib/vlog-modules.def
lib/xfif-linux.c
lib/xfif-netdev.c
lib/xfif-provider.h
lib/xfif.c
lib/xflow-util.c
ofproto/discovery.c
ofproto/discovery.h
ofproto/fail-open.c
ofproto/in-band.c
ofproto/in-band.h
ofproto/ofproto-sflow.c
ofproto/ofproto.c
ofproto/ofproto.h
ofproto/pinsched.c
ofproto/pinsched.h
ofproto/wdp-xflow.c
ofproto/wdp.c
ofproto/wdp.h
tests/test-classifier.c
tests/test-flows.c
utilities/ovs-dpctl.c
utilities/ovs-ofctl.c
utilities/ovs-openflowd.8.in
utilities/ovs-openflowd.c
vswitchd/bridge.c
vswitchd/ovs-vswitchd.c