Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Thu, 22 Jul 2010 19:31:55 +0000 (12:31 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 22 Jul 2010 19:31:55 +0000 (12:31 -0700)
commit966b5d43f2bc060dca3c19767db0a3dcd1ebb799
treeafcbd7d65f71bbd16151e6761ca65873de75e5bb
parentfa8c8a7c975c91edae26a561365a3bf1b31e6d67
parent480ce8abca4ae262a4148fe757aebe3e0ddba6f6
Merge "master" into "wdp".
43 files changed:
datapath/actions.c
datapath/actions.h
datapath/datapath.c
datapath/vport-internal_dev.c
datapath/vport-netdev.c
datapath/vport.c
datapath/vport.h
lib/automake.mk
lib/flow.c
lib/learning-switch.c
lib/mac-learning.c
lib/netdev-gre.c
lib/netdev-patch.c
lib/netdev-vport.c
lib/netdev.c
lib/ofp-print.c
lib/ofp-util.c
lib/ofp-util.h
lib/rtnetlink.c
lib/svec.c
lib/xfif-linux.c
lib/xfif-netdev.c
lib/xfif-provider.h
lib/xfif.c
lib/xfif.h
lib/xflow-util.c
ofproto/discovery.c
ofproto/fail-open.c
ofproto/in-band.c
ofproto/ofproto-sflow.c
ofproto/ofproto.c
ofproto/pktbuf.c
ofproto/wdp-xflow.c
ofproto/wdp.c
tests/automake.mk
tests/test-flows.c
utilities/ovs-dpctl.8.in
utilities/ovs-dpctl.c
utilities/ovs-ofctl.c
utilities/ovs-openflowd.8.in
utilities/ovs-openflowd.c
vswitchd/bridge.c
vswitchd/ovs-vswitchd.c