git://git.onelab.eu / sliver-openvswitch.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d67486 95ee79a)
Merge "master" into "wdp".
authorBen Pfaff <blp@nicira.com>
Mon, 9 Aug 2010 17:44:39 +0000 (10:44 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 9 Aug 2010 17:44:39 +0000 (10:44 -0700)
commit78661a5ed344f6f4c3d45d64662a74947b31435d
tree6c57e0ecf22ea545e7ca5ecc414549da085bc3c9tree | snapshot
parent7d674866d2c95d9027fc2e64d1acc2044e2c004acommit | diff
parent95ee79a8c9352237b900bf829e7cf722f3f0ec2bcommit | diff
Merge "master" into "wdp".
25 files changed:
datapath/actions.c diff1 | diff2 | blob | history
datapath/datapath.c diff1 | diff2 | blob | history
datapath/dp_notify.c diff1 | diff2 | blob | history
datapath/dp_sysfs_dp.c diff1 | diff2 | blob | history
datapath/dp_sysfs_if.c diff1 | diff2 | blob | history
datapath/flow.c diff1 | diff2 | blob | history
datapath/flow.h diff1 | diff2 | blob | history
datapath/vport-internal_dev.c diff1 | diff2 | blob | history
datapath/vport-netdev.c diff1 | diff2 | blob | history
datapath/vport.c diff1 | diff2 | blob | history
include/openvswitch/xflow.h | diff2 | blob | history
lib/automake.mk diff1 | diff2 | blob | history
lib/flow.c diff1 | diff2 | blob | history
lib/learning-switch.c diff1 | diff2 | blob | history
lib/ofp-parse.c diff1 | | blob | history
lib/vlog-modules.def diff1 | diff2 | blob | history
lib/xfif-netdev.c | diff2 | blob | history
ofproto/ofproto.c diff1 | diff2 | blob | history
ofproto/ofproto.h diff1 | diff2 | blob | history
ofproto/wdp-xflow.c | diff2 | blob | history
utilities/ovs-ofctl.8.in diff1 | diff2 | blob | history
utilities/ovs-ofctl.c diff1 | diff2 | blob | history
utilities/ovs-openflowd.8.in diff1 | diff2 | blob | history
utilities/ovs-openflowd.c diff1 | diff2 | blob | history
vswitchd/bridge.c diff1 | diff2 | blob | history
sliver-openvswitch