Merge remote branch 'origin/master' into wdp-merge
authorBen Pfaff <blp@nicira.com>
Tue, 22 Jun 2010 18:07:47 +0000 (11:07 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 22 Jun 2010 18:07:47 +0000 (11:07 -0700)
commit060a2a4480e2f3e8fb2a3c6dfd4a468074a229aa
tree420b7db203053e2b893311dadf03fc967ece7fd6
parent888c6726f8f72991aed89445fe2988505ca06b92
parent9fc10ed911312c9cec86ef968877cae568770151
Merge remote branch 'origin/master' into wdp-merge

Conflicts:
datapath/datapath.c
datapath/vport.c
datapath/vport.h
include/openvswitch/automake.mk
include/openvswitch/datapath-protocol.h
lib/dpif-netdev.c
lib/vconn.c
lib/vconn.h
lib/vlog-modules.def
lib/xfif-provider.h
ofproto/fail-open.c
ofproto/ofproto-sflow.c
ofproto/ofproto.c
30 files changed:
datapath/actions.c
datapath/datapath.c
datapath/flow.c
datapath/vport-internal_dev.c
datapath/vport-netdev.c
datapath/vport.c
datapath/vport.h
include/openvswitch/automake.mk
include/openvswitch/xflow.h
lib/automake.mk
lib/netdev-gre.c
lib/netdev-patch.c
lib/netdev-provider.h
lib/netdev-vport.c
lib/netdev.c
lib/netdev.h
lib/ofp-util.c
lib/vconn.h
lib/vlog-modules.def
lib/xfif-netdev.c
lib/xfif-provider.h
ofproto/discovery.c
ofproto/fail-open.c
ofproto/ofproto-sflow.c
ofproto/ofproto.c
ofproto/pinsched.c
ofproto/pktbuf.c
ofproto/wdp-xflow.c
utilities/ovs-ofctl.c
vswitchd/bridge.c