[ovs-git] Open vSwitch: Merge "master" into "next". (next)
dev at openvswitch.org
dev at openvswitch.org
Wed Feb 24 22:11:55 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".
The branch, next has been updated
via 02dd3123a0e312f1d33403e744af52dd6096f12d (commit)
via efa6c663df0bcad748e3a89d7b3f4dec187f6f53 (commit)
via 2f0a1f4277ed61e765e6e5383c07fe8fa1f067d3 (commit)
via 6ce6d3c928f26bacca60baf716b4b99a05a45ba7 (commit)
via 75e8b46925ef94be2867ad427fa8c04a55673472 (commit)
via 03292c465464a1bb10b07ea5036ce64083984dd3 (commit)
via d42c4f8dc1d39dcc1f102b56f63e4c128a2d767b (commit)
via 4380e924b27fb8528e1c50ebfb4dab4d76f9601d (commit)
via 7f3adc00f8d9cc0e035cd58817a28301e62eaec8 (commit)
via e5f1d483899c1d43709262650cd001e169efc0b4 (commit)
via 54e05b5f6f7d3504dc74a73dcf9707cbdb28d1d1 (commit)
via 608efb41cefb76e371d44489950b797aca6f8e98 (commit)
via c5bcb08001200972983486a22255a35960192ac7 (commit)
via 25acf322b972c15468b56f022cb48187409df339 (commit)
via 39e94ea4dbf60510965620859655fb78f4529404 (commit)
via 381328fe36480b63a73cd5b164047e27622e772f (commit)
via 68d1c8c3c3de2f2dc093901d4d83567a37375bc4 (commit)
via de6a71659a2a7d36610110962307feb4af9c4cdc (commit)
via 30012c72af2e0984fb58e386a4e2a5f6e3b6631a (commit)
via 88a20d6e4c8a44bec62e288748620e69d97a729a (commit)
via b97ba90b95c18a7b6b16fc8821b8ef3c6b61a05c (commit)
via 77512e6a11657a5353477a59325031f1c0609116 (commit)
via 0ab8e15fd7b5618c0c513c69ab6fd4155eb13452 (commit)
via 5019f688d4e3117960503d57978ff2e0fb3771e0 (commit)
via 3b917492c68516f113fe3d02cb4ed9885fae6b4d (commit)
via 33ce24ed460797596b14c9ec89e4eb7de262ba4d (commit)
via da0603cf278a9f505dc2988602ec0071c771dd2e (commit)
from ed951f15779df008e43012d99cdb51f3c5a57229 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02dd3123a0e312f1d33403e744af52dd6096f12d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=02dd3123a0e312f1d33403e744af52dd6096f12d
Author: Ben Pfaff <blp at nicira.com>
Merge "master" into "next".
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 +
configure.ac | 2 +-
datapath/actions.c | 2 +-
include/openflow/openflow.h | 6 -
include/openvswitch/datapath-protocol.h | 1 +
lib/classifier.c | 13 ++
lib/classifier.h | 1 +
lib/compiler.h | 13 ++-
lib/dpif-netdev.c | 9 +-
lib/dpif.h | 8 ++
lib/flow.h | 1 +
lib/ofp-print.c | 3 +-
lib/ofpbuf.c | 20 +++-
lib/ofpbuf.h | 6 +-
lib/packets.h | 3 +
lib/pcap.c | 8 +-
lib/poll-loop.h | 8 ++
lib/rconn.c | 68 ++++++++---
lib/rconn.h | 3 +-
lib/sflow_poller.c | 27 ++++-
lib/sflow_sampler.c | 7 +-
lib/stp.c | 2 +
lib/util.h | 2 -
lib/vconn.c | 195 +++++++++++++++++++++----------
lib/vconn.h | 4 +-
ofproto/netflow.h | 3 +-
ofproto/ofproto.c | 2 +
ofproto/ofproto.h | 8 ++
ofproto/pinsched.c | 5 +-
ofproto/pktbuf.c | 8 +-
30 files changed, 324 insertions(+), 118 deletions(-)
hooks/post-receive
--
Open vSwitch
More information about the git
mailing list