[ovs-git] Open vSwitch: Merge "master" into "wdp". (wdp)
dev at openvswitch.org
dev at openvswitch.org
Tue Jun 1 17:43:59 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, wdp has been updated
via ba5c210e41cfc0b23abdc525634470137be65000 (commit)
via b9b0865ac2b92e3aa0db70bccbddb3b943f7ea20 (commit)
via 8b75073b0c677f66a1621a67a0df9e6f55309ea9 (commit)
via 4eb26d3cd41b6bcbd3e12e85bc9e4f36f47eb430 (commit)
via c178dfe0b0422a04df9dab93d9563474acecef32 (commit)
via 1df624e6a36278f7c8668c6da4623c2411b10004 (commit)
via 69a4a76b9413b88f5b5eec5705250b4312811478 (commit)
via 87103e1fccd88e0fc8a64d774ddb620deeb90678 (commit)
via 4cdb08c02a3d3067194c659a442d3679cdd8dd35 (commit)
via 79b18681997dbba888ae61d9e1b079642f7b859a (commit)
via 5d0ae1387c968859b390dba9768ce44ac788405b (commit)
via 208d496f15787e55777c2ef541595f9e750ef771 (commit)
via 609d182a8161e9e87300cc680ff55c50d02b6e22 (commit)
via 40cae6703c5f65b423f57ce1cee28963e2687fd8 (commit)
via 487ec65f157060b83ee050dc516ddd792574543b (commit)
via 5153ef3da7cd08b88fb398815c4141ff398016f2 (commit)
via e75e8930d35a286270b33a746c2b61b5f2185b8b (commit)
via bfb1f2d5cbb9ef82f2def2f41f5ff8a8f02b5bbc (commit)
via 7089685a9e9807d2c8bc37ec55e05142edddd7fa (commit)
via c83cdd307248d798eac0d85681b0abeaaff1bf61 (commit)
via b90fa799b93b5cc10f57e714909fb35ad472772e (commit)
via b662d24bd42f182a3ad1e9ca7ecb5ab2aa037480 (commit)
via 0ec6cfb13b4d9ef14b90119cf662e47ed559a185 (commit)
via 3762274e6359f4afe04107851f4c71347fa0afa0 (commit)
via 9d82ec478d52edfddd215dff1b0659ed7508b365 (commit)
via a36919566a348427d28dce06b607a3dcfeb64822 (commit)
via 70d3fbe7658b59bac65f8b4f2ba03602acf7f1c2 (commit)
via 3223e977cae4125b24ebb9498e0b67b4d8fac4c3 (commit)
via a238d75e3527a18efae40f1cadc2a95261249580 (commit)
via 7cf8b2660f9813fe080a3f4fcc975099cb36417a (commit)
via 8bf4bbe390af3f370e7e95d9237572ff750047a8 (commit)
via 3c442619836797b78bbb3472385a4982582cb907 (commit)
via 65d9d5f8b8fd548f411c512e946cf2408182a1d4 (commit)
via 4d9c0a1e256a8c1524ee6e19cd2ae3d026543ba0 (commit)
from 27df1a03937da19fc5f5f170a9a833ca14eb194b (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 ba5c210e41cfc0b23abdc525634470137be65000
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=ba5c210e41cfc0b23abdc525634470137be65000
Author: Ben Pfaff <blp at nicira.com>
Merge "master" into "wdp".
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +
Makefile.am | 44 +-
acinclude.m4 | 4 +-
boot.sh | 4 +
build-aux/update-debian-changelog | 37 +
configure.ac | 2 +-
datapath/datapath.c | 4 +-
datapath/flow.h | 1 +
.../linux-2.6/compat-2.6/include/linux/if_vlan.h | 43 +-
.../linux-2.6/compat-2.6/include/linux/skbuff.h | 4 +-
.../linux-2.6/config/config-linux-2.6.23-rc9-kvm | 1408 --------------------
debian/automake.mk | 5 +
debian/changelog | 6 +-
extras/ezio/ezio-term.c | 11 +-
extras/ezio/ovs-switchui.c | 8 +-
include/openvswitch/xflow.h | 240 ++--
lib/automake.mk | 17 +-
lib/daemon.c | 2 +
lib/dhcp-client.c | 9 +-
lib/flow.h | 5 +-
lib/learning-switch.c | 8 +-
lib/mac-learning.c | 2 +-
lib/netdev.c | 2 +
lib/poll-loop.c | 40 +-
lib/poll-loop.h | 5 +-
lib/rconn.c | 5 +-
lib/socket-util.c | 29 +-
lib/stream-fd.c | 3 +-
lib/stream-tcp.c | 1 +
lib/stream-unix.c | 1 +
lib/unixctl.c | 15 +-
lib/xfif-linux.c | 1 +
lib/xfif-netdev.c | 1 +
lib/xfif.c | 2 +
lib/xflow-util.c | 8 +-
lib/xflow-util.h | 1 +
m4/as_echo.m4 | 96 --
m4/openvswitch.m4 | 4 +-
ofproto/collectors.c | 3 +-
ofproto/discovery.c | 1 +
ofproto/fail-open.c | 2 +-
ofproto/in-band.c | 10 +-
ofproto/ofproto-sflow.c | 2 +-
ofproto/ofproto.c | 11 +-
ofproto/wdp-xflow.c | 2 +-
ovsdb/automake.mk | 2 +
ovsdb/log.c | 1 +
ovsdb/ovsdbmonitor/automake.mk | 1 +
ovsdb/ovsdbmonitor/ovsdbmonitor.py.in | 37 -
ovsdb/trigger.c | 4 +-
tests/classifier.at | 34 +-
tests/ovsdb-data.at | 8 +-
tests/test-classifier.c | 10 +-
tests/test-vconn.c | 2 +-
utilities/automake.mk | 8 +-
utilities/ovs-dpctl.c | 1 +
utilities/ovs-ofctl.c | 1 +
vswitchd/automake.mk | 14 +-
vswitchd/bridge.c | 20 +-
vswitchd/ovs-vswitchd.8.in | 2 +
vswitchd/proc-net-compat.c | 26 +-
xenserver/ovs-xenserverd.c | 2 +-
62 files changed, 493 insertions(+), 1794 deletions(-)
create mode 100755 build-aux/update-debian-changelog
delete mode 100644 datapath/linux-2.6/config/config-linux-2.6.23-rc9-kvm
delete mode 100644 m4/as_echo.m4
delete mode 100755 ovsdb/ovsdbmonitor/ovsdbmonitor.py.in
hooks/post-receive
--
Open vSwitch
More information about the git
mailing list