[ovs-git] Open vSwitch: Merge "master" into "wdp". (wdp)

dev at openvswitch.org dev at openvswitch.org
Fri Aug 20 18:10:48 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  7b9bbb8c896777a02b9a3827603c0f5368c8929e (commit)
       via  28eec6e50c32c7e848835232aa321ad8fa30d987 (commit)
       via  50d2d532ed4615279bbeba010c9545c629c7c107 (commit)
       via  b56042ac5deef373cefe156fc18dc38257d6ddfe (commit)
       via  95bfc0b8565bcff46f5fd9f6d0ba3072abe476ee (commit)
       via  2d1c5712afd3e076e77212e558a86638134de399 (commit)
       via  3becd6c845c7d507623506795a809888f7091479 (commit)
       via  a95b3cc0c7c9d9487ff830a1e30a8309c394873b (commit)
       via  812560d7cea7f618f8fd7110063e8dd039547006 (commit)
       via  a946ed39420c86cd3cf98436f9b1005c85f9bb31 (commit)
       via  a2a9d2d9df6fdc80438760b7e343baba7dcc817d (commit)
       via  d006d0ccb0bc2f227b5765577f69c9ad77353b91 (commit)
       via  27a5949697b180f4962d3b5064fc324c1565b18c (commit)
       via  bb41d3d4e9b608bf46182d9650f903dbd53c8feb (commit)
       via  3ab5bd21328923e4b4b1b0a7655db3bd3e0db629 (commit)
       via  4d712aa8fdbd20b98b9771f223ab7c8ad5f538dc (commit)
       via  9026bf34308675459fe0813f995251eca3822eda (commit)
       via  c9cdd3d3a7139dc618ea603010bf6c73d2b4e21e (commit)
       via  5f8bfd69fd6173d525e6fe92902dd8c6628fc327 (commit)
       via  ba186119ca5f787486189c041d76d63dee629dc1 (commit)
       via  10df718e73122df2f3b04ed585e50e4b299a8cbd (commit)
       via  e251c8d0050acf8d3f35c91b6d2708fab5314ce7 (commit)
       via  e2c1a82010cc4f35cb576d41c3c2020010503784 (commit)
       via  2cc906419fd8592c24a281a2c4b0932ad978be3d (commit)
       via  df5d2ed998115b4aace007508e0cc374f5f84ab5 (commit)
       via  3d41239d308452b43bdf64d8acf7dde20e0fb986 (commit)
       via  e519ea28d6da56330a46c5b1d7c3ad84a6c45536 (commit)
       via  e85bbd75f7eafe06edcd3edf88bb685e1541bcfe (commit)
       via  c547535a7c25ce4717b965b77877062796f12a95 (commit)
       via  f2f7be8696e030dbe6f7c859c4e2bd76fd363036 (commit)
       via  da61d5732e5c8344a976275922c7d51c05c45781 (commit)
       via  68eb03912212f272fbff8a358827ee4996f18b64 (commit)
       via  142181fcd734a2afff9fe13e54fe51c7a2c824d2 (commit)
       via  1805876e50b89816581dac16d7283bd130b84c72 (commit)
       via  50f06e1642e246bb9969035c9e3db7c44e7b95e0 (commit)
       via  eca2df312b03f39a28d361682b692a3dc547a79a (commit)
      from  a112265c8b32101f74815398295d054da1714e21 (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 7b9bbb8c896777a02b9a3827603c0f5368c8929e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=7b9bbb8c896777a02b9a3827603c0f5368c8929e
Author: Ben Pfaff <blp at nicira.com>
		
Merge "master" into "wdp".
		


-----------------------------------------------------------------------

Summary of changes:
 AUTHORS                                            |    5 +
 PORTING                                            |    6 +-
 datapath/flow.c                                    |   98 +-
 debian/automake.mk                                 |    1 +
 debian/control                                     |   28 +-
 debian/corekeeper.override                         |    1 +
 ...tch-datapath-module-_KVERS_.postinst.modules.in |    2 -
 debian/openvswitch-switch.init                     |    4 +-
 debian/rules.modules                               |    3 +-
 extras/ezio/ovs-switchui.c                         |   19 -
 include/openflow/nicira-ext.h                      |   14 +-
 lib/automake.mk                                    |    5 +-
 lib/backtrace.c                                    |   14 +-
 lib/daemon.c                                       |    4 +
 lib/entropy.c                                      |   65 +
 extras/ezio/vt.h => lib/entropy.h                  |   13 +-
 lib/flow.c                                         |  216 ++--
 lib/hmap.c                                         |   33 +
 lib/hmap.h                                         |    2 +
 lib/learning-switch.c                              |  328 +-----
 lib/learning-switch.h                              |    2 +-
 lib/ovsdb-idl-provider.h                           |   23 +
 lib/ovsdb-idl.c                                    |  125 ++-
 lib/ovsdb-idl.h                                    |    4 +
 lib/packets.h                                      |    3 +
 lib/random.c                                       |   78 +-
 lib/shash.c                                        |   11 +
 lib/shash.h                                        |    1 +
 lib/socket-util.c                                  |    3 +-
 lib/ssl-bootstrap.man                              |    2 +-
 lib/ssl-peer-ca-cert.man                           |   13 +-
 lib/ssl-syn.man                                    |    2 +-
 lib/stp.c                                          | 1233 --------------------
 lib/stp.h                                          |  103 --
 lib/stream-ssl.c                                   |  105 ++-
 lib/util.c                                         |    3 +-
 lib/uuid.c                                         |   28 +-
 lib/vconn-stream.c                                 |    3 +-
 lib/vlog-modules.def                               |    2 +-
 lib/vlog.c                                         |    3 +-
 lib/xfif-netdev.c                                  |   17 +-
 lib/xflow-util.c                                   |   11 +-
 lib/xflow-util.h                                   |    4 +
 ofproto/ofproto.c                                  |   13 -
 ofproto/ofproto.h                                  |    1 -
 ofproto/wdp-xflow.c                                |    4 +-
 ovsdb/ovsdb-client.1.in                            |    3 +
 ovsdb/ovsdb-server.1.in                            |   17 +-
 tests/.gitignore                                   |    1 -
 tests/automake.mk                                  |    7 -
 tests/flowgen.pl                                   |   14 +-
 tests/stp.at                                       |  303 -----
 tests/test-flows.c                                 |    1 +
 tests/test-stp.c                                   |  666 -----------
 tests/testsuite.at                                 |    1 -
 utilities/ovs-controller.c                         |    2 +-
 utilities/ovs-openflowd.8.in                       |    3 +
 utilities/ovs-openflowd.c                          |   20 -
 utilities/ovs-vsctl.8.in                           |    7 +-
 utilities/ovs-vsctl.c                              |    7 +-
 vswitchd/bridge.c                                  |   13 +
 vswitchd/ovs-vswitchd.8.in                         |    3 +
 vswitchd/vswitch.xml                               |   28 +-
 xenserver/etc_init.d_openvswitch                   |    7 +
 64 files changed, 757 insertions(+), 3004 deletions(-)
 create mode 100644 debian/corekeeper.override
 create mode 100644 lib/entropy.c
 copy extras/ezio/vt.h => lib/entropy.h (74%)
 delete mode 100644 lib/stp.c
 delete mode 100644 lib/stp.h
 delete mode 100644 tests/stp.at
 delete mode 100644 tests/test-stp.c


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list