git://git.onelab.eu / sliver-openvswitch.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 827ab71 2e28176)
Merge 'next' into 'master'.
authorBen Pfaff <blp@nicira.com>
Wed, 18 May 2011 21:01:13 +0000 (14:01 -0700)
committerBen Pfaff <blp@nicira.com>
Wed, 18 May 2011 21:01:13 +0000 (14:01 -0700)
commitb2fda3effc787f265b5ad5dfa967ac00627bd075
tree5c0017aedd36c0d9088dcd67a79beb8ff69bd4f9tree | snapshot
parent827ab71c97f25b77c94a1158834cdad35df6806fcommit | diff
parent2e281761473ed67ecae00205f62180e9a21c9adecommit | diff
Merge 'next' into 'master'.

I know already that this breaks the statsfixes that were implemented by the
following commits:

827ab71c97f "ofproto: Datapath statistics accounted twice."
6f1435fc8f7 "ofproto: Resubmit statistics improperly account during..."

These were already broken in a previous merge.  I will work on a fix.
19 files changed:
lib/bond.c diff1 | diff2 | blob | history
lib/dpif-linux.c diff1 | diff2 | blob | history
lib/dpif-netdev.c diff1 | diff2 | blob | history
lib/flow.c diff1 | diff2 | blob | history
lib/flow.h diff1 | diff2 | blob | history
lib/netdev-linux.c diff1 | diff2 | blob | history
lib/nx-match.c diff1 | diff2 | blob | history
lib/ofp-print.c diff1 | diff2 | blob | history
lib/ofp-util.c diff1 | diff2 | blob | history
lib/ofp-util.h diff1 | diff2 | blob | history
ofproto/ofproto-dpif.c | diff2 | blob | history
ofproto/ofproto.c diff1 | diff2 | blob | history
tests/ofproto-macros.at diff1 | diff2 | blob | history
tests/ovs-ofctl.at diff1 | diff2 | blob | history
utilities/ovs-controller.c diff1 | diff2 | blob | history
utilities/ovs-ofctl.c diff1 | diff2 | blob | history
utilities/ovs-openflowd.c diff1 | diff2 | blob | history
vswitchd/bridge.c diff1 | diff2 | blob | history
vswitchd/ovs-vswitchd.c diff1 | diff2 | blob | history
sliver-openvswitch