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

dev at openvswitch.org dev at openvswitch.org
Wed Dec 2 19:52:41 UTC 2009


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, db has been updated
       via  58fda1dab104041fc693032475ec4662c1a52849 (commit)
       via  6c88d577e83db12f73df12be8fc575419b011fda (commit)
       via  f20279afbdcd101c4fb808ab73e176f9783b14d6 (commit)
       via  318e2e6d604927bf63abc1f76cd034c61d8e8e49 (commit)
       via  e3e9370bf9ee0fde67b3d94acf119cec5dc3701d (commit)
       via  cfae8ec3e7ba9e02d4f994f77ef70435cd3575e5 (commit)
       via  efacbce62f4ca3baf305441641ee35aa5b657442 (commit)
       via  6bab37989b1b5e8981bee80e1fedef621799332c (commit)
       via  af48f1dc8ce8913a967045540bcb0cc200ec007f (commit)
       via  4f2eb9a7e861da23560bb84d50685c836c195419 (commit)
       via  1901968e76429f834fa88a3494be768002089645 (commit)
       via  9ab3d9a3c24ee7132d85f5874f35ea5cb98b1588 (commit)
       via  d161c099279e9ab564636c72423268e6da69f795 (commit)
       via  83f6c0502c67ea117c73d3bbb91f9b9e0e81bf87 (commit)
       via  7ddda086a5aba2310d144847e078ef6eda67f38c (commit)
       via  7671589afbe5e7ff8a7f2e730ed077416e419fa8 (commit)
       via  9af9e2e8cff919c6053d862703ac228ce1a15bdd (commit)
       via  f7fed00035a1b7822c1d61e568bc31e842f192db (commit)
       via  e8cf6733e490cf78c1e5f5f58c3655011fb8ae22 (commit)
       via  6a33828dbcc9a4f67bd730061b931c77caad2990 (commit)
       via  d17ee8689bff22541dccaa792b70a848641f3646 (commit)
       via  0cd8a05ec036ca8f950d4d4034a80bf485581b6a (commit)
       via  5ef800a6909fabfb2331a2da90450c23ca61aa06 (commit)
       via  7c9e113b712e72fcb4ccc6075da7334cb3391059 (commit)
       via  d377243b8557ae8e6c1d374d76b6ee29fd61ceb4 (commit)
       via  37c9895288d0f2f8517da4db0df17a004f1faa37 (commit)
       via  460d80629bc2c7b382f137c968f73ce2be983892 (commit)
       via  de3f65ea52d60d70b104d852dbc752cb48ccf8f1 (commit)
       via  5f21d20e65f1846c346704ac7c749a3f0ad8660e (commit)
       via  e423eca6e9bb71cb6e61fa3aeaa70e5525507770 (commit)
       via  2d70a31aced4b50f888464a1f986bf82b2aa69d1 (commit)
       via  985224ac0c6a2eeebf71c58b12893eafe2386a3d (commit)
       via  fb344b867b96a6d6b9ec32e277cae6db68f2f236 (commit)
       via  4836f9f2bfa5dc0531bd1d828aae96ccd6b415cb (commit)
       via  436cf33bb74f422ef3fe02527eeebf6b0817fa04 (commit)
       via  8fe1a59d281369829f474dc75eb5905c991ccd94 (commit)
       via  42c3641cc473cfb3ae7d80363835da7df85cad2e (commit)
       via  e7e3f48570f1115e020413fe3ed7460a22fdad91 (commit)
       via  c4b1912e822a579d72e01fcff70d06a2c84c0306 (commit)
       via  b4785c1e43c418496fe4456e026457048575e81d (commit)
       via  14986b312eebf556c20e03b49fbff51859e38c5a (commit)
       via  f1bd68ab587edcbf6d6702c1843eba286db190ab (commit)
       via  42061b2a5b79d44c0ff9442a8203f0c7672ee9cf (commit)
       via  e96a4d8035367297f1d19a70e59976a20bf72517 (commit)
       via  46d6f36f042e5a23d1548ca4d2f1c8eeca9031ca (commit)
       via  d65349ea28bb67a0062a9b4b60ff97538206373b (commit)
       via  f2d7fd66cf51b83acbe509f8ef6d4b34538d0646 (commit)
       via  93dfc06772a722abf3362606307bab9a9bf33292 (commit)
       via  8ddb3f376d06374525cea4aa647462d8f520ed78 (commit)
       via  01b528c1b7af38678f29a6b21c0bc220560c97f7 (commit)
       via  3fbe1d307e27ed99528d83cf866c7df497e58b77 (commit)
       via  8b2a2f4a793ec5ba735510c315a9d619439ac83c (commit)
       via  2886875a385df582354ac916431b278f2fe698e0 (commit)
       via  cc56746aed6d53046b17b01756362e566734241c (commit)
       via  7559c396688cbbc6fab80897bbb4b993646bcf54 (commit)
       via  fde05aded2906e113d02aa13d207d9a6e3e0ea99 (commit)
       via  094e151456b597c278f3b416523cf36b5e8e7f99 (commit)
       via  18fdbe16de40062c63f9119a6beef17602f4b233 (commit)
       via  ae602adc43835e56ce388d11c55aa2599a6fa8ad (commit)
       via  cae7a4b90a55cbfd4cfd23c06f9f09cd429ab4c0 (commit)
       via  2a577bd807023009afab02d975787d67389c4a27 (commit)
       via  30746a1b6a9758a58d6f9a7a85830512aa0e114f (commit)
       via  0193b2afceb14b2daccc5d91395903f88606253c (commit)
       via  6d91c2fb6c169ac84ace876a4c34929cb84e26ae (commit)
       via  0c0afbecaace0509d7b2e5b7dee4b4eac7b31e19 (commit)
       via  d99e262b28c34442045e53df746937432853809c (commit)
       via  3d3d15a0e6e9104f6c29e3ab21f4ea7189dccbab (commit)
       via  14a34fe401551c7839306e3cf7a22c5bf83b52a5 (commit)
       via  6a07af3678afc64e39a330fc07362a940ef1ecce (commit)
       via  d6fbec6de043d5b9323a06417cc25b0fbba0ff8f (commit)
       via  9052790aac60c01195c170d0ed2c7159e1343af7 (commit)
       via  cdd35cff225bf39767ea9e2e535cf2940b0e5127 (commit)
       via  69d60f9f4e8d8f1930cea759e67037f47b1bdddb (commit)
      from  c3bb4bd7f1d9c045a5e5d7062b09d4dac4e48195 (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 58fda1dab104041fc693032475ec4662c1a52849
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=58fda1dab104041fc693032475ec4662c1a52849
Author: Ben Pfaff <blp at nicira.com>
		
Merge "master" branch into "db".
		


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

Summary of changes:
 INSTALL.Linux                                      |   34 +-
 INSTALL.bridge                                     |    7 +-
 INSTALL.userspace                                  |   63 +++
 Makefile.am                                        |    2 +
 README                                             |   15 +-
 acinclude.m4                                       |   85 +++-
 configure.ac                                       |    2 +-
 datapath/actions.c                                 |   38 +-
 datapath/actions.h                                 |    1 -
 datapath/datapath.c                                |   23 +-
 datapath/flow.c                                    |   45 +--
 datapath/flow.h                                    |    2 -
 datapath/linux-2.6/Makefile.main.in                |    2 +-
 .../linux-2.6/compat-2.6/include/linux/skbuff.h    |   11 +
 debian/openvswitch-switch.logrotate                |    2 +-
 extras/ezio/ovs-switchui.c                         |    6 +-
 include/openflow/openflow.h                        |    2 +-
 include/openvswitch/datapath-protocol.h            |    4 +
 lib/backtrace.c                                    |    6 +-
 lib/classifier.h                                   |   14 +
 lib/dpif-linux.c                                   |    2 +-
 lib/dpif-netdev.c                                  |   30 +-
 lib/dpif-provider.h                                |    4 +-
 lib/dpif.c                                         |   24 +-
 lib/dpif.h                                         |    1 +
 lib/fault.c                                        |    2 +-
 lib/flow.c                                         |    2 +-
 lib/leak-checker.c                                 |    2 +-
 lib/learning-switch.c                              |   43 ++-
 lib/learning-switch.h                              |    4 +-
 lib/lockfile.c                                     |    4 +-
 lib/mac-learning.c                                 |   35 ++-
 lib/mac-learning.h                                 |    3 +
 lib/netdev-linux.c                                 |  131 +++++-
 lib/netdev-provider.h                              |   82 +++-
 lib/netdev.c                                       |  227 ++++++++--
 lib/netdev.h                                       |    7 +
 lib/odp-util.c                                     |    5 +-
 lib/ofp-print.c                                    |   15 +-
 lib/pcap.c                                         |    2 +-
 lib/poll-loop.c                                    |    3 +-
 lib/socket-util.c                                  |   37 +-
 lib/socket-util.h                                  |    4 +-
 lib/stream-tcp.c                                   |    4 +-
 lib/svec.c                                         |   16 +
 lib/svec.h                                         |    1 +
 lib/timeval.c                                      |   18 +-
 lib/unixctl.c                                      |    2 +-
 lib/vconn-ssl.c                                    |    4 +-
 lib/vconn-tcp.c                                    |    4 +-
 lib/vconn.c                                        |   23 +-
 lib/vlog-modules.def                               |    1 +
 lib/vlog-unixctl.man                               |    4 +-
 lib/vlog.man                                       |    4 +-
 ofproto/automake.mk                                |    2 +
 ofproto/collectors.c                               |  123 +++++
 lib/backtrace.h => ofproto/collectors.h            |   18 +-
 ofproto/in-band.c                                  |   64 ++--
 ofproto/netflow.c                                  |  230 ++++-----
 ofproto/netflow.h                                  |   42 ++-
 ofproto/ofproto.c                                  |  275 +++++++---
 ofproto/ofproto.h                                  |   15 +-
 utilities/ovs-appctl.8.in                          |  123 +++---
 utilities/ovs-appctl.c                             |  254 +++++------
 utilities/ovs-controller.8.in                      |   19 +-
 utilities/ovs-controller.c                         |   27 +-
 utilities/ovs-dpctl.c                              |    8 +-
 utilities/ovs-ofctl.8.in                           |   12 +
 utilities/ovs-ofctl.c                              |   18 +-
 utilities/ovs-openflowd.8.in                       |   27 +-
 utilities/ovs-openflowd.c                          |   39 ++-
 utilities/ovs-vsctl.8.in                           |   38 +-
 utilities/ovs-vsctl.in                             |   47 +-
 vswitchd/bridge.c                                  |  485 ++++++++++++------
 vswitchd/mgmt.c                                    |    2 +-
 vswitchd/ovs-brcompatd.8.in                        |    6 +-
 vswitchd/ovs-brcompatd.c                           |    5 +-
 vswitchd/ovs-vswitchd.8.in                         |    6 +
 vswitchd/ovs-vswitchd.conf.5.in                    |   40 +-
 xenserver/LICENSE                                  |  523 ++++++++++++++++++++
 xenserver/etc_init.d_vswitch                       |   12 +-
 xenserver/etc_xensource_scripts_vif                |   18 +-
 .../opt_xensource_libexec_interface-reconfigure    |   23 +-
 .../usr_share_vswitch_scripts_dump-vif-details     |   33 +-
 84 files changed, 2661 insertions(+), 987 deletions(-)
 create mode 100644 INSTALL.userspace
 create mode 100644 ofproto/collectors.c
 copy lib/backtrace.h => ofproto/collectors.h (64%)
 create mode 100644 xenserver/LICENSE


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list