[ovs-git] Open vSwitch: Merge master branch into xs5.7. (xs5.7)

dev at openvswitch.org dev at openvswitch.org
Wed Nov 18 22:29:23 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, xs5.7 has been updated
       via  dac3c52f893f7df16f935ef4875c5467abd4ea23 (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)
       via  3f355f47f8e7343e909ccfa854454d667baf3c38 (commit)
       via  2416b8eceae7b2508fe72efbc17d9cb71b69d330 (commit)
       via  5422a9e189c627202a0eaa568a52d17e088d82fb (commit)
       via  3a55ef14838f9552fa824b90599aa2a6493bb04a (commit)
       via  450f38cf3c84f7b6f4722e174d824f328b4414f8 (commit)
       via  adea354e28134f08008732062ef0c613954dc7e4 (commit)
       via  1125a1b9dc3ffe95bddafa7f85a95d0e337c01ca (commit)
       via  4d14e30f80e2e2d72fcf3aba840fa55eaed1121f (commit)
       via  2792c2ad6d2483f5114ef9a96049742afb042181 (commit)
       via  3d1b9636b27ee256f91e03aa3c9bbf526ef6719f (commit)
       via  37c84020e98ae97356447740a0cf906bdb4d3e64 (commit)
       via  03fbffbda4d36188944a4df39eace449a0c306dd (commit)
       via  43a6c464efaf271411c8e2d19357e11bf6ff5afa (commit)
       via  5562d3ccd2073617fa2cb6a1384bbae0b5a08109 (commit)
       via  1b378b99f638212216f2090cb7be7efab3d90c14 (commit)
       via  7c40efc9d3a24a5ccd1415b46efff51060f85a57 (commit)
       via  43aa5f47f1ece799ebb85cd1c8ddfdaefe7b7402 (commit)
       via  aed944953be7c8d71beada565ac9923ab86855e5 (commit)
       via  bf7446a4f4b17cebb4500fe9d57b8d240567795e (commit)
       via  bc17490dfccee9734a7a8f7b61bafec3a7664b8a (commit)
       via  b3137fe852171f8e87a49ef0939a52d91ea09720 (commit)
       via  97b7b2f410e487f59ae3690213cfc8de0c8b88fb (commit)
       via  6a5d4138d6317922fd3386f096ff45f08cdc9544 (commit)
       via  a4fbb689b03ad18651ee119ba5ce0ff8cf8d95b5 (commit)
       via  e7f327ff6bd90bb0ce695ca71054d17829a16888 (commit)
       via  ef5925df6af03cf47a4931539016715f6ac3f661 (commit)
       via  2b71f0116078b38b2bee0538b4633e19996badfe (commit)
      from  c07686a4b073aa2092a0653a3fa92bb78688e090 (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 dac3c52f893f7df16f935ef4875c5467abd4ea23
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=dac3c52f893f7df16f935ef4875c5467abd4ea23
Author: Ben Pfaff <blp at nicira.com>
		
Merge master branch into xs5.7.
		
Conflicts:
	xenserver/README
	xenserver/automake.mk
	xenserver/etc_xensource_scripts_vif
	xenserver/usr_share_vswitch_scripts_dump-vif-details
	xenserver/vswitch-xen.spec


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

Summary of changes:
 ChangeLog                                          |    4 +
 INSTALL.Linux                                      |   34 +-
 INSTALL.userspace                                  |   51 ++
 Makefile.am                                        |    1 +
 README                                             |   15 +-
 acinclude.m4                                       |   75 ++-
 configure.ac                                       |    4 +-
 datapath/actions.c                                 |   38 +-
 datapath/actions.h                                 |    1 -
 datapath/datapath.c                                |   44 ++-
 datapath/datapath.h                                |    1 +
 datapath/dp_dev.c                                  |   35 ++-
 datapath/flow.c                                    |   45 +--
 datapath/flow.h                                    |    2 -
 datapath/linux-2.6/Makefile.main.in                |    2 +-
 datapath/linux-2.6/Modules.mk                      |    3 +-
 .../linux-2.6/compat-2.6/include/linux/skbuff.h    |    4 +-
 .../linux-2.6/compat-2.6/include/net/checksum.h    |    7 +-
 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/cfg.c                                          |    2 +-
 lib/daemon.c                                       |    2 +
 lib/dpif-linux.c                                   |    2 +-
 lib/dpif-netdev.c                                  |   14 +-
 lib/fault.c                                        |    2 +-
 lib/flow.c                                         |    2 +-
 lib/leak-checker.c                                 |    2 +-
 lib/mac-learning.c                                 |   35 ++-
 lib/mac-learning.h                                 |    3 +
 lib/odp-util.c                                     |    5 +-
 lib/ofp-print.c                                    |   15 +-
 lib/pcap.c                                         |    2 +-
 lib/poll-loop.c                                    |    3 +-
 lib/timeval.c                                      |   24 +-
 lib/timeval.h                                      |    1 +
 lib/unixctl.c                                      |    2 +-
 lib/vconn.c                                        |   23 +-
 lib/vlog-unixctl.man                               |    4 +-
 lib/vlog.man                                       |    4 +-
 ofproto/in-band.c                                  |   64 ++--
 ofproto/netflow.c                                  |  113 ++++-
 ofproto/netflow.h                                  |   42 ++-
 ofproto/ofproto.c                                  |  280 ++++++++---
 ofproto/ofproto.h                                  |   15 +-
 tests/ovs-vsctl.at                                 |   91 ++++-
 utilities/ovs-appctl.8.in                          |  123 +++---
 utilities/ovs-appctl.c                             |  254 +++++------
 utilities/ovs-controller.c                         |    6 +-
 utilities/ovs-dpctl.c                              |    8 +-
 utilities/ovs-ofctl.8.in                           |   12 +
 utilities/ovs-ofctl.c                              |   28 +-
 utilities/ovs-openflowd.8.in                       |   11 +-
 utilities/ovs-openflowd.c                          |   11 +-
 utilities/ovs-vsctl.8.in                           |   69 ++-
 utilities/ovs-vsctl.in                             |  303 ++++++++----
 vswitchd/INTERNALS                                 |   17 +-
 vswitchd/bridge.c                                  |  498 ++++++++++++-------
 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/README                                   |    6 +
 xenserver/automake.mk                              |    1 +
 xenserver/etc_init.d_vswitch                       |   12 +-
 xenserver/etc_xensource_scripts_vif                |   20 +-
 .../opt_xensource_libexec_interface-reconfigure    |   23 +-
 ..._share_vswitch_scripts_refresh-xs-network-uuids |   12 +
 xenserver/vswitch-xen.spec                         |    3 +
 73 files changed, 2254 insertions(+), 883 deletions(-)
 create mode 100644 INSTALL.userspace
 create mode 100644 xenserver/LICENSE
 create mode 100755 xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list