[ovs-git] Open vSwitch: Merge "master" into "wdp". (wdp)
dev at openvswitch.org
dev at openvswitch.org
Wed Oct 6 18:37:24 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 d15a5ee594f46a855788652e687aa5d736d530fb (commit)
via 4bee421f3ab28492aebc32b8b13e41ca5d12a936 (commit)
via eedc0097f475a15297375a2aba39313c0f98f330 (commit)
via 9ebc44ae8c5940513a8dcc2aab8dcca8aff9d2a2 (commit)
via 48f846e66ef06c39228fb1d3f8d8bfd1c695c93d (commit)
via 8b055d92533271b05843f4b62fa98aba5e7ce90a (commit)
via d4cdc6b4c45e5ca6a44bccf90f856b76ef936fac (commit)
via ad67e568887f56d3b70a8225c3a476d94f70c20b (commit)
via 09913dfd259ae81dee6c944db1b92e9722f17667 (commit)
via 0e581146fe81fce12c9e72cb70e06eba940720b5 (commit)
via 3ff4f87161e4e82eec2393db067cf57c5721ea0b (commit)
via 15f1f1b63ab5514f8dfafa8f4c90ecee44693e1d (commit)
via bb98f9b951af0f6438d921522a8f54f5ead0d1d0 (commit)
via 1ac788f67ff614662ce7d9af36d5eb7597f53a3f (commit)
via d5590e7e4114253bc5b84b494dba18be24e6073f (commit)
via d2805da2cb2256e9e2efc5074fbe8df55408213f (commit)
via 4e8e4213a815a30216e855a805a8bcd5b8c5a886 (commit)
via adf7cfd851c3d9d6f1ad74653cbd2fecce8c3ba9 (commit)
via ca0f572cfe87f284018e14fa7f1de58fbaef4c87 (commit)
via 0cc96e48ab2fc573c3b7b69fe5a034bb29dde578 (commit)
via d9a8717a004310044b3157f4fb46e8fd00083a73 (commit)
via f3099647623f2b13ece56cf8cf31761c00c1c297 (commit)
via 93b13be8e65455ecf6e568e604cf76fdb20601c9 (commit)
via 0c18b5a065365e79d92d66532e7bdc41c4588f33 (commit)
via 1998cd4d3ef151a57abf9a2e826659f28146362b (commit)
via c84d769c147830be5aa99ed3e6bdc92af15abd5d (commit)
via 55f8a832c181a047f06f57125a2c0da9c235e030 (commit)
via b0e62f3daca16a97541d33798e65894fcfa9623c (commit)
via 85d32f1feed0befba10dd9727a99d16b22b3e0b1 (commit)
via 6793129d369dee182d9260620d1db9188f09d986 (commit)
via 9c64f2384d850658985d7e18003443c196e89ae1 (commit)
via 998bb652ecb494af8aa38ed0ae4e653cd8dff709 (commit)
via 0d8568c13e6cfd34e0da977279f93beb26e33968 (commit)
via 9a3f4a496f9772b65562044f722536cd6270f698 (commit)
via c1fdab010642441ca14954383ab351fc5f38465a (commit)
via d1984028446c334c33569127f6db98a423569f2d (commit)
via 9704460403a02554595b5a7ed17914a0b0357cac (commit)
via 69c675a07271d6b4b9bfd9ed49ac354f7af24613 (commit)
via 2b8e39ae83c28509accc56597da0fae1032aaaf1 (commit)
via fca426efdad5e21a55f4a106ce7b2f0d1c4a5875 (commit)
via cd0cd65fe3721aa575e5eec081783f8047eda545 (commit)
via ce8876775477a359f3ae14b8cae0ef2212f1681b (commit)
via c94238565522c51a117a7f89fecaabd2605b7c66 (commit)
via e4af561537cfea7d35d2075596b4474847876794 (commit)
via 4f2226487d3522654876885d769510b835c5f5ee (commit)
via e4bd5e2a6c4223fd9cfb2dd1ad82a4eeb1b1fbe6 (commit)
via cbbdf81cf8bfcc87e141f66b93bf3bcf1220bff8 (commit)
via 5136364f41b74de00f86873a6f5be4c8a19cb5ad (commit)
via 1095d0996bf83e99eab0be964b66403d3fff76f5 (commit)
via 88cd3cc9f41f916fd51ad1cd02cbbfb50d9b476d (commit)
via b13300c7178527f85937604022a755e174a0e1aa (commit)
via e6494c64e35f62411f770be086ba6a0914afaf5d (commit)
via a3acf0b0c46a28d6c891086e054d81dd915eea2e (commit)
via f10a03343b5dd77a41dfefad150b65863af38a00 (commit)
via dca9309ae888995f13be5e1bfa607214ca531613 (commit)
via 842cf6f472b236b6e61be04b41970116245b1759 (commit)
via 7c79397fe8ff52eb9cfe4d32a9d1f8b2f23c45c8 (commit)
via b7a31ec13d0617868378d39a72beb4c4ffcb7e5c (commit)
via 3976f6d57b1134c5c3ed054c9da4aa6786fbf5bf (commit)
via fb8c93473efacd67a50117d0f2a3084f2d96ceca (commit)
via 560e802229f3028c02273435dd1c6efba33e0949 (commit)
via 02892690e6866781a0a6c84e25a2c1d277822788 (commit)
via 6787c8cd1c5a4882e9370d3d0dad4590f781ae42 (commit)
via ee5311097049272834308f64931172f1c8210755 (commit)
via 9b35536a145361285d341f83bc6fc19408bb04e5 (commit)
via 1d7ab9963c34b2f23608195b81312bafa4c01cd6 (commit)
via 88ec924aba6e3301b97110994e7da18c2331faa7 (commit)
via bad973d7ae0ca5273b46c79b4bd9007e607f277c (commit)
via aed133bf9bce8f35b666c3052907f525c803c83b (commit)
via b524945e78804bf4ef46abb936eba829538f8e29 (commit)
via 97685b902d63f48bdc9f63e5458a1ac5ae59b0b5 (commit)
via 5fa555b3cf6030bbeda1bbcf169d514f3ae1a077 (commit)
via 9884eaad2b8386aefa036f370891fd1159598994 (commit)
via 1d273d6d802e5daeebe551e8ca0c3e99f4dda15e (commit)
via cbb863426624fff643b30b22ddb8c524ec7891c4 (commit)
via b9ddc6aaaea369faf7787b690de2ae56ffd08ad9 (commit)
via 2ed7d6e227c009f0f6bdabbb85262d8aac896e00 (commit)
via 110b54816bb56b8ba4878812ad300a3a277abb06 (commit)
via c0c2489aabc0d19495909ac7391ea7427d9b458a (commit)
via 3f5d8c02b213ea42dcf892635c1db310f00d855e (commit)
via 2a022368f4b37559de5d5621a88c648023493f75 (commit)
via 1089aab7136612acb86cdcd638d7d2261311531a (commit)
via 00456ddda4110f7f75ea9f8a703b31c7f2df7649 (commit)
via 6b7b9d34c0eab9871cf6284c41108a84129817f3 (commit)
via 4fefc29e00f032fb4187d4af0e05cdd328e76dde (commit)
via 3273ae634ab473ddd6f8bedea4550e25f8718e77 (commit)
via b828c2f5fa580412f7c3afae03862b9dcce6f576 (commit)
via 7ac60147cdba1af0b066e0e3cb3ca83f9bbf4101 (commit)
via 5c16362b51eed5eb76c7e92629e2e7900b8c2ca9 (commit)
via 8e236e71f2e52ee47b2787fa722f2dfb36c2c284 (commit)
via bbf4f269a391724d886f66b3661b10e5a434e2e8 (commit)
via 8ba1fd2fb9eb616ec028027e303c1664185c88e7 (commit)
via a154533795474bd8d13a2a935c4b6719215d6907 (commit)
via a77d89b84ad05d880f9ad7c5b5bd3f7d221d76f3 (commit)
via 92467099ee05b930b060d34d05b81bb1322e6fbf (commit)
via 24926bc2276a480d5a36667d26020f828a7122c2 (commit)
via 60bb134ae3aa7f60d2b20ce007b2a52bd9b14d14 (commit)
via 722d19c504351a3e1a6f64e5a01ff9806eb089a4 (commit)
via fd2a9392411147654dad43f93741a1aa634187b5 (commit)
via a44be3f0cf616166f550ba65769766a577b4eaf5 (commit)
via d59051362fa8ac4369f1be69ac942a52c9a424b9 (commit)
via b14c5fe9bd85b440d1727934c84d5f7fded051f7 (commit)
via 29e21ea26944731f9b9681fecedc81cd5c86f342 (commit)
via 6784cb57cf432197c497764cdb01cecd68f10362 (commit)
via 933df876ffa272d9d5768edf7fc5465261888ad2 (commit)
via e215ebca67720188724344eb198c5045c02e375f (commit)
via 82e959195414246dece1e4c636b40d06d65211a7 (commit)
via e61070c32030d6d00e2eeae213d219320a7cbd10 (commit)
via c9b5816cfd8fccc2abedd258d914882033bfcf0a (commit)
via 68efcbec41b0acfd8bb7579a5d38afd71b6daf7c (commit)
via f79cb67e689566cfbf3071e0ac0e29923ada5a97 (commit)
via fdf2037829befd7e7fc337a477950fdc7f1cb09b (commit)
via 476d56f51d4935ff437537db151a49c7db8cd897 (commit)
via cd8055cce3e9dcd20c6125f064d73ef04b99aee4 (commit)
via c259baae45d76592eb14db5abde20aa72e7f2605 (commit)
from e9ec7451755a50449811738b5a0adad49a864fe3 (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 d15a5ee594f46a855788652e687aa5d736d530fb
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=d15a5ee594f46a855788652e687aa5d736d530fb
Author: Ben Pfaff <blp at nicira.com>
Merge "master" into "wdp".
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 5 +
COPYING | 3 +-
ChangeLog | 11 +
INSTALL.Linux | 33 +-
PORTING | 3 +
README | 2 +-
REPORTING-BUGS | 25 +-
acinclude.m4 | 2 +
configure.ac | 7 +-
datapath/brcompat.c | 6 +
datapath/datapath.c | 75 +-
datapath/datapath.h | 4 +-
datapath/flow.c | 62 +-
datapath/flow.h | 21 +-
datapath/linux-2.6/Modules.mk | 2 -
.../linux-2.6/compat-2.6/include/linux/kernel.h | 1 +
.../linux-2.6/compat-2.6/include/linux/random.h | 17 -
.../linux-2.6/compat-2.6/include/linux/types.h | 7 +-
.../linux-2.6/compat-2.6/include/linux/workqueue.h | 65 +-
datapath/linux-2.6/compat-2.6/random32.c | 144 ---
datapath/tunnel.c | 989 ++++++++++++-----
datapath/tunnel.h | 153 +++-
datapath/vport-capwap.c | 69 +-
datapath/vport-gre.c | 59 +-
datapath/vport-internal_dev.c | 3 +-
datapath/vport-patch.c | 5 +-
datapath/vport.c | 3 +
datapath/vport.h | 3 +-
debian/.gitignore | 2 +
debian/automake.mk | 18 +
debian/changelog | 15 +
debian/control | 30 +-
debian/copyright | 67 --
debian/copyright.in | 146 +++
debian/openvswitch-common.install | 2 +
debian/openvswitch-controller.init | 6 +-
debian/openvswitch-datapath-source.README.Debian | 4 +-
debian/openvswitch-ipsec.dirs | 1 +
debian/openvswitch-ipsec.init | 188 ++++
debian/openvswitch-ipsec.install | 1 +
debian/openvswitch-switch.init | 20 +-
debian/openvswitch-switch.postinst | 11 -
debian/ovs-bugtool | 1114 ++++++++++++++++++++
debian/ovs-bugtool.8 | 46 +
debian/ovs-monitor-ipsec | 350 ++++++
debian/python-openvswitch.dirs | 2 +
debian/python-openvswitch.install | 2 +
debian/rules | 1 +
include/openflow/nicira-ext.h | 25 +-
include/openvswitch/tunnel.h | 1 +
lib/classifier.c | 43 +-
lib/daemon.c | 30 +-
lib/dynamic-string.c | 2 -
lib/hmap.c | 17 +
lib/hmap.h | 50 +-
lib/json.c | 1 -
lib/learning-switch.c | 177 ++--
lib/learning-switch.h | 34 +-
lib/list.h | 24 +-
lib/lockfile.c | 4 +-
lib/mac-learning.c | 2 +-
lib/netdev-linux.c | 178 ++--
lib/netdev-tunnel.c | 20 +
lib/netdev-vport.c | 3 +-
lib/netdev.c | 23 +-
lib/netlink.c | 10 +-
lib/ofp-parse.c | 100 ++-
lib/ofp-parse.h | 3 +
lib/ofp-print.c | 128 ++-
lib/ofp-util.c | 18 +
lib/ofp-util.h | 2 +
lib/ofpbuf.c | 20 +
lib/ofpbuf.h | 3 +
lib/ovsdb-data.c | 25 +
lib/ovsdb-data.h | 3 +
lib/ovsdb-idl.c | 46 +-
lib/poll-loop.c | 4 +-
lib/process.c | 4 +-
lib/queue.h | 5 +-
lib/rtnetlink.c | 6 +-
lib/shash.c | 17 +-
lib/shash.h | 10 +-
lib/stream-fd.c | 2 +-
lib/stream-ssl.c | 6 +-
lib/unixctl.c | 8 +-
lib/util.h | 10 +
lib/vlog-modules.def | 1 +
lib/vlog.h | 15 +
lib/xfif-linux.c | 12 +-
lib/xfif-netdev.c | 20 +-
lib/xflow-util.c | 3 +
ofproto/netflow.c | 87 ++-
ofproto/ofproto-sflow.c | 72 +-
ofproto/ofproto.c | 59 +-
ofproto/pktbuf.c | 4 +-
ofproto/status.c | 5 +-
ofproto/wdp-xflow.c | 275 +++--
ovsdb/execution.c | 3 -
ovsdb/file.c | 2 +-
ovsdb/jsonrpc-server.c | 26 +-
ovsdb/ovsdb-doc.in | 14 +-
ovsdb/ovsdb-server.c | 4 +-
ovsdb/ovsdb-tool.c | 1 -
ovsdb/query.c | 8 +-
ovsdb/row.c | 14 +-
ovsdb/table.c | 6 +-
ovsdb/transaction.c | 20 +-
ovsdb/trigger.c | 4 +-
python/ovs/daemon.py | 30 +-
python/ovs/db/types.py | 6 +-
python/ovs/poller.py | 7 +-
tests/automake.mk | 1 +
tests/daemon-py.at | 53 +-
tests/interface-reconfigure.at | 6 +-
tests/ovs-ofctl.at | 26 +
tests/ovs-vsctl.at | 55 +-
tests/test-classifier.c | 2 +-
tests/test-csum.c | 3 +-
tests/test-daemon.py | 21 +-
tests/test-hmap.c | 9 +-
tests/test-list.c | 10 +-
tests/test-ovsdb.c | 9 +-
tests/testsuite.at | 1 +
utilities/ovs-controller.8.in | 26 +-
utilities/ovs-controller.c | 121 ++-
utilities/ovs-ofctl.8.in | 32 +-
utilities/ovs-ofctl.c | 111 +-
utilities/ovs-openflowd.c | 4 -
utilities/ovs-vsctl.8.in | 109 ++-
utilities/ovs-vsctl.c | 271 +++--
vswitchd/automake.mk | 2 +
vswitchd/bridge.c | 139 ++-
vswitchd/proc-net-compat.c | 5 +-
vswitchd/system-stats.c | 503 +++++++++
lib/entropy.h => vswitchd/system-stats.h | 11 +-
vswitchd/vswitch.ovsschema | 9 +-
vswitchd/vswitch.xml | 350 +++++--
xenserver/GPLv2 | 339 ++++++
xenserver/LICENSE | 5 -
xenserver/README | 9 +-
xenserver/automake.mk | 3 +-
xenserver/etc_init.d_openvswitch | 27 +-
.../etc_xapi.d_plugins_openvswitch-cfg-update | 6 +-
xenserver/etc_xensource_scripts_vif | 6 +-
xenserver/openvswitch-xen.spec | 6 +-
...ensource_libexec_InterfaceReconfigureVswitch.py | 7 +-
..._lib_xsconsole_plugins-base_XSFeatureVSwitch.py | 23 +-
xenserver/usr_sbin_brctl | 2 +-
...usr_share_openvswitch_scripts_ovs-external-ids} | 103 ++-
...re_openvswitch_scripts_refresh-xs-network-uuids | 7 +
xenserver/uuid.py | 53 +
151 files changed, 6253 insertions(+), 1799 deletions(-)
delete mode 100644 datapath/linux-2.6/compat-2.6/include/linux/random.h
delete mode 100644 datapath/linux-2.6/compat-2.6/random32.c
delete mode 100644 debian/copyright
create mode 100644 debian/copyright.in
create mode 100644 debian/openvswitch-ipsec.dirs
create mode 100755 debian/openvswitch-ipsec.init
create mode 100644 debian/openvswitch-ipsec.install
create mode 100755 debian/ovs-bugtool
create mode 100644 debian/ovs-bugtool.8
create mode 100755 debian/ovs-monitor-ipsec
create mode 100644 debian/python-openvswitch.dirs
create mode 100644 debian/python-openvswitch.install
create mode 100644 tests/ovs-ofctl.at
create mode 100644 vswitchd/system-stats.c
copy lib/entropy.h => vswitchd/system-stats.h (79%)
create mode 100644 xenserver/GPLv2
rename xenserver/{usr_share_openvswitch_scripts_monitor-external-ids => usr_share_openvswitch_scripts_ovs-external-ids} (78%)
hooks/post-receive
--
Open vSwitch
More information about the git
mailing list