Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Wed, 6 Oct 2010 18:37:03 +0000 (11:37 -0700)
committerBen Pfaff <blp@nicira.com>
Wed, 6 Oct 2010 18:37:03 +0000 (11:37 -0700)
commitd15a5ee594f46a855788652e687aa5d736d530fb
tree6cd499aa6fde6ec6db9d6543d7b99ce09cef0d15
parente9ec7451755a50449811738b5a0adad49a864fe3
parent4bee421f3ab28492aebc32b8b13e41ca5d12a936
Merge "master" into "wdp".
38 files changed:
datapath/datapath.c
datapath/datapath.h
datapath/flow.c
datapath/flow.h
datapath/tunnel.c
datapath/vport-internal_dev.c
datapath/vport.c
datapath/vport.h
include/openflow/nicira-ext.h
lib/classifier.c
lib/hmap.h
lib/learning-switch.c
lib/list.h
lib/mac-learning.c
lib/netdev-tunnel.c
lib/netdev-vport.c
lib/netdev.c
lib/ofp-parse.c
lib/ofp-parse.h
lib/ofp-print.c
lib/ofp-util.c
lib/ofp-util.h
lib/rtnetlink.c
lib/vlog-modules.def
lib/xfif-linux.c
lib/xfif-netdev.c
lib/xflow-util.c
ofproto/ofproto-sflow.c
ofproto/ofproto.c
ofproto/pktbuf.c
ofproto/wdp-xflow.c
tests/automake.mk
tests/test-classifier.c
utilities/ovs-controller.c
utilities/ovs-ofctl.8.in
utilities/ovs-ofctl.c
utilities/ovs-openflowd.c
vswitchd/bridge.c