[ovs-git] Open vSwitch: Merge 'next' into 'master'. (master)
dev at openvswitch.org
dev at openvswitch.org
Wed May 18 21:02:55 UTC 2011
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, master has been updated
via b2fda3effc787f265b5ad5dfa967ac00627bd075 (commit)
via 2e281761473ed67ecae00205f62180e9a21c9ade (commit)
via 6f77f4ae984340daaf3d56103af4f42331fedb26 (commit)
via 56c769aba6f8a7dc21f88c577bc80841f538e8cc (commit)
via 23adee4206a98975750a076f9298541868c7c504 (commit)
via 3476e0baaaddb7a25237297d1811a28ba11c21e6 (commit)
via 454b299181be4e614e1dbc19bc7929ae9bfef439 (commit)
via 7afa4f1d98d26066c66572f5af3d433ae9d18bb9 (commit)
via a7d790694580d959271fe97d108d9d03d9a89983 (commit)
via 7df6a8bdb4abe4ac41c6d1a9043b69cbaea23bcc (commit)
via 76ed83fc3f82f6d3074c4f87a38dd9ef164b6dc0 (commit)
via e65942a0679133af3325a214cc6be82b619a363e (commit)
via e16b024e1b68b2b1c616cb5faa8f5f640e74861a (commit)
via 8dd5089e2ba60908864931cbbbcad7d281e24d34 (commit)
via 93946b3ed75d2d5b55a43c9b5c5df2ca7f0956be (commit)
via 007948177581f3b3dad188221593d0e4bdca6ba0 (commit)
via fc08b7a2397ef0cf55014c1ee159599fb420b73e (commit)
via 6c1491fbd75754d2e4d5028650554f9d5d3a4958 (commit)
via 154896e3b99978317d74b5c9847fe07ec01b54b3 (commit)
via da40ecacc1e30901684cd0e1df4856bbe442d501 (commit)
via eeaefa7878b6d7682c6dbd58789d685b6daecc86 (commit)
via 08944c1db1ab2707e28deab838dc0937bf8de8ae (commit)
via c084ce1d3f3147d757087502bc2ccd7400d0691f (commit)
via 806cd5c7cc1adbb4696b96d1429650f2ade5c848 (commit)
via f797957ad6fe772a95450d57fe1352709bb83ecd (commit)
via 78bd1cd00123f479b6b4affd999c29fd0a6f4884 (commit)
via 8b05efc6b4a9aa77be588310e223f9826401208b (commit)
via 5bf0e941d91cc1236b0fa9551a75a287ca31282f (commit)
via abe529af477b8311a1fd68c130374bd7442003c3 (commit)
via f79e673f3d3f429cd213043b054c904d23c7151a (commit)
via 892815f564700501888139823ad282355a691e10 (commit)
via 63d347ce1bb0019713fcae184ac574335d717df0 (commit)
via 54ed8a5d74773e75b79490dc65e65b7498a14fb7 (commit)
via 640e1b20776f40633d33a5c2c2bba3e79eda0b64 (commit)
via fa066f015f716c74315fed1a08912d003dfe3f8c (commit)
via 1fa24dea754741732caa2ec2d04b365656d71962 (commit)
via 0f7d71a567a64c59e42e2cee583c6d45147c3398 (commit)
via d4cb239a1ccbdf8e9f1ac70a38d995b326c7997f (commit)
via d647f0a7442e7c9a0aa6026f55de2c74734599af (commit)
via f4ac3fc104d83edce7d3f2410a7b02cb56dd0ac2 (commit)
via f8ddccd2852c10758854ac18c7d440cca68e3964 (commit)
via 2ac6beddbf6a85299c449939a2086126f1f47dbc (commit)
via 35c33856b41546a1eb650bf69f1f38fc14cc2f79 (commit)
via d08a2e920631099d68f4efd4e72f6c14987520ce (commit)
via 66da9beffd4a20a334833ea765b8ab0260a28a92 (commit)
via 3a225db7079158d1c46e56dced7ac3103a8864e2 (commit)
via 6f90b8f40239afdf88259ba5d9cf2af21df9e9cd (commit)
via e8192d80ba7a7d741a80eaa7861bc8df31f402e4 (commit)
via 764072fd84f6e657899a34f8670357aee0d59879 (commit)
via b5827b24c7c136b088e719bfe2020de31032ae37 (commit)
via ebea37cc67751a05dbefec0246fb2a62576f4389 (commit)
via 2c360fbb2777fba6d35599e4b53287e2ecb26fa9 (commit)
via 9cfcdadf934213982a0fb96a29d100e8ba0187f7 (commit)
via 9e97e8bbe37bfcc6c308be29df637b1776d1f76e (commit)
via f0356b074db2436b713e9f91761da8ef16eeb2a9 (commit)
via be6255a8251ae69f8a5d54c5afad9604bf9e907b (commit)
via c3effea5f6f8c6741ee10c0aa99ddfa211b77c4a (commit)
via 7ae792355f8854f54f0d169b91c5f2ee10b368f1 (commit)
via 8e2e7a5d54779ac8ee880fdef612c6eaa9ce5667 (commit)
via 2a4ae6357eb447e185599ec1ca7c95b1e4183c19 (commit)
via 0fb7b9156ac7d319a51890630857698ad1877335 (commit)
via 08fd19f01b22226e25a5112b13eb951190ea8d00 (commit)
via 02013bc03c5d5d9497af2ccb6982feb97dd5ee94 (commit)
from 827ab71c97f25b77c94a1158834cdad35df6806f (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 b2fda3effc787f265b5ad5dfa967ac00627bd075
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=b2fda3effc787f265b5ad5dfa967ac00627bd075
Author: Ben Pfaff <blp at nicira.com>
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.
-----------------------------------------------------------------------
Summary of changes:
PORTING | 358 ++--
include/openflow/nicira-ext.h | 62 +-
lib/automake.mk | 4 +
lib/bitmap.h | 8 +-
lib/bond.c | 39 +-
lib/bond.h | 1 +
lib/classifier.c | 30 +-
lib/classifier.h | 3 +-
lib/dpif-linux.c | 4 +-
lib/dpif-netdev.c | 56 +-
lib/dpif-provider.h | 15 +-
lib/dpif.c | 88 +-
lib/dpif.h | 7 +-
lib/flow.c | 6 +-
lib/flow.h | 4 +-
lib/hmapx.c | 197 ++
lib/hmapx.h | 71 +
lib/learning-switch.c | 1 +
lib/mac-learning.c | 28 +-
lib/mac-learning.h | 2 +-
lib/netdev-linux.c | 2 +
lib/nx-match.c | 8 +-
lib/odp-util.c | 5 +-
lib/ofp-parse.c | 37 +-
lib/ofp-parse.h | 9 +-
lib/ofp-print.c | 16 +-
lib/ofp-util.c | 71 +-
lib/ofp-util.h | 11 +-
lib/vlan-bitmap.c | 60 +
lib/vlan-bitmap.h | 47 +
ofproto/automake.mk | 5 +-
ofproto/connmgr.c | 101 +-
ofproto/connmgr.h | 7 +-
ofproto/fail-open.c | 1 +
ofproto/in-band.c | 1 +
lib/timer.c => ofproto/names.c | 29 +-
ofproto/ofproto-dpif.c | 3931 ++++++++++++++++++++++++++++++++++++++++
ofproto/ofproto.c | 3630 ++++++++++---------------------------
ofproto/ofproto.h | 156 ++-
ofproto/pinsched.c | 6 +-
ofproto/pktbuf.c | 8 +-
ofproto/private.h | 743 ++++++++
tests/ofproto-macros.at | 2 +-
tests/ofproto.at | 6 +-
tests/ovs-ofctl.at | 9 +-
tests/test-classifier.c | 14 +-
utilities/automake.mk | 5 +-
utilities/ovs-controller.c | 8 +-
utilities/ovs-ofctl.8.in | 27 +-
utilities/ovs-ofctl.c | 66 +-
utilities/ovs-openflowd.c | 22 +-
vswitchd/bridge.c | 2878 +++++++++---------------------
vswitchd/ovs-vswitchd.c | 3 -
53 files changed, 7727 insertions(+), 5181 deletions(-)
create mode 100644 lib/hmapx.c
create mode 100644 lib/hmapx.h
create mode 100644 lib/vlan-bitmap.c
create mode 100644 lib/vlan-bitmap.h
copy lib/timer.c => ofproto/names.c (54%)
create mode 100644 ofproto/ofproto-dpif.c
create mode 100644 ofproto/private.h
hooks/post-receive
--
Open vSwitch
More information about the git
mailing list