Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Tue, 1 Jun 2010 17:40:17 +0000 (10:40 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 1 Jun 2010 17:40:17 +0000 (10:40 -0700)
commitba5c210e41cfc0b23abdc525634470137be65000
treeb29a63d94fade977fed74ef6f7984bde6a1718ac
parent27df1a03937da19fc5f5f170a9a833ca14eb194b
parentb9b0865ac2b92e3aa0db70bccbddb3b943f7ea20
Merge "master" into "wdp".
22 files changed:
datapath/datapath.c
datapath/flow.h
datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h
include/openvswitch/xflow.h
lib/automake.mk
lib/flow.h
lib/netdev.c
lib/xfif-linux.c
lib/xfif-netdev.c
lib/xfif.c
lib/xflow-util.c
lib/xflow-util.h
ofproto/discovery.c
ofproto/fail-open.c
ofproto/in-band.c
ofproto/ofproto-sflow.c
ofproto/ofproto.c
ofproto/wdp-xflow.c
tests/test-classifier.c
utilities/ovs-dpctl.c
utilities/ovs-ofctl.c
vswitchd/bridge.c