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

nicira-dev at nicira.com nicira-dev at nicira.com
Wed Aug 19 20:04:48 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, master has been updated
       via  8fef8c7121222233075a03d57db7e0b48d5f6be5 (commit)
       via  d2cd45db48e2713b74c3a31f746f923a72294e46 (commit)
       via  a20d2466fcd4edc2f2cfbc870c225a3afb96ffd5 (commit)
       via  f35409904bc4a0a695a4aecb2435933d8a8187fe (commit)
       via  5ec6690ca447dd25e3d04b60ca66d2e6e1cf37f2 (commit)
       via  63920cb960ffe2c494f73982f6ea073a4dc3460d (commit)
       via  88acec3bb517fda9c1f5f32d6eec92a153e12b1c (commit)
       via  c87d1024dd662d17c69828b4ad035b3ad93b3ea7 (commit)
       via  05e2ad788d25615602a5fe01acaa6d5617280945 (commit)
       via  bc952bb371d72971ddfdfafc36aff35dcd9f9548 (commit)
       via  8f749dac31670788f00beaf50baafd0881213e60 (commit)
       via  0d7e8aac8dbecf1481afcf909b5f156286f52944 (commit)
       via  c170afc1dbdcf2e5adb1a0d2da6635bd81b7126f (commit)
       via  6dac2b9ed9d77a92f53258f694117fa8b989aacb (commit)
       via  35c979bff42010f54842d00bec8836f1d3f30545 (commit)
       via  db322751d8bba32152e89eea476cb47a010616b1 (commit)
       via  ae1281cfa015b710817822002f21a4f6195cb740 (commit)
       via  621fd03a0717358fb8600a8bacb99782ab181005 (commit)
       via  41e754bcb40f78f5a2a790a4b196433cd1afa304 (commit)
       via  7f42c1d707c65befb9d92bebae069e4f4b0be1fb (commit)
       via  c338e47fbef2ce1354acbd9f521196dea3fe93f5 (commit)
       via  f86e18b739d8f6f8f714a4ce0cb38f6ac58b1108 (commit)
       via  0ceda58c0697cb3c1ad8b85dc21d105049f92129 (commit)
       via  16cd277e74b37072301c395c0067d1a17184e533 (commit)
       via  e7bd7d78b1e1dbc2162f991374c7889c7d7bf60c (commit)
       via  8093d640ac758c062515b2819e633dd4e19c516a (commit)
       via  91a1e24d09ba1f08b1f8c08815f595187c6ef946 (commit)
       via  c4fca56af2c5cfc8ecfb33648bf4722d3bec5388 (commit)
       via  b566902b599073806d69b722cabb3d242f50d1fa (commit)
       via  c239b2d4f3535012bea0261ff81fc570771b6f9b (commit)
       via  9dc898c09dbaa363695d9a9368d30b8b24f06600 (commit)
       via  42ab0203399b1ea32556319e1c73aa093c4b24f9 (commit)
       via  2bb451b698fa45c4c616ba721bd8fc6d07064bb7 (commit)
       via  449776d81d7b03d9b5f552b402c8a619323e8aa2 (commit)
       via  ba09980aaff81d5ba31aa221179740bc04680787 (commit)
       via  c874dc6d6b892a7697c0c83a070a5b0a564be55f (commit)
       via  0515ceb3e82ecc6160a141017c20ca26ec1a7a5f (commit)
       via  58c342f617051e9e2ffb09710b4ef2b22c34e79a (commit)
       via  3de35df914e39692470a5d4546cb1fae2d93a316 (commit)
       via  2ba9026e2fc114fa50ae923312340e9f08a1f513 (commit)
       via  2e7dd8eca88d131112a76301da24709b0472e381 (commit)
       via  3cc42ebbc144096dc56b618845519daf2d48ef6e (commit)
       via  5e93df1c46954b9a2c60c8e11bbf8ea25a1686ce (commit)
       via  8cc013b20f730d394b89748b4b5fae27821ed908 (commit)
       via  1dcf111b1cb66fe1f3ed2e45f66ab6f5659a6527 (commit)
       via  110d69af04a250cc2560644edd65a27158fa45e3 (commit)
       via  590ab3cc649ca3ecc56e6c5057e7e4e24874a625 (commit)
       via  85c74638ed99b77d6894385c3dce0175c4b4baa4 (commit)
       via  2aebae8397b7c698a627d5a1c7f4b931bf611516 (commit)
       via  acf827ca41409fd29ea8dcce03e1e464dd97aa0a (commit)
       via  4f2cad2c3b1079ede2d3eed0dd25423552105255 (commit)
       via  c2fea58ce74361f355bedc3ab580a514d615809f (commit)
       via  06052e0c891c4ea0fac9164a4ff2555a1eb38e69 (commit)
       via  5a4baac6c28485838ca4059f6fda33b23e62f267 (commit)
       via  ba8de5cbc7a5a1edadf371107c55f946e25421d3 (commit)
       via  f9fb1858ef9f5c85863b320638b07af8043d1e5a (commit)
       via  c9aaa87707cb12b94518fdcb822ce00fa98ff614 (commit)
       via  acd0a902c1bca1fb6e775fa2d360c05b3773f259 (commit)
       via  58b7527ecbf053004cc555aa433168395f0ec622 (commit)
      from  6dd3fad481b5d801695c2b0529c7d37cac2c9b19 (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 8fef8c7121222233075a03d57db7e0b48d5f6be5
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=8fef8c7121222233075a03d57db7e0b48d5f6be5
Author: Ben Pfaff <blp at nicira.com>
		
Merge citrix into master.
		
This was a somewhat difficult merge since there was a fair amount of
superficially divergent development on the two branches, especially in the
datapath.

This has been build-tested against XenServer 5.5.0 and XenServer 5.7.0
build 15122.  It has been booted and connected to XenCenter on 5.5.0.

The merge revealed a couple of outstanding bugs, which will be fixed on
citrix and then merged back into master.


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

Summary of changes:
 datapath/Modules.mk                                |    3 +
 datapath/brc_sysfs.h                               |   24 -
 datapath/brcompat.c                                |  146 +--
 datapath/datapath.c                                |   99 +-
 datapath/datapath.h                                |   16 +-
 datapath/dp_dev.c                                  |   12 +-
 datapath/dp_notify.c                               |   23 +-
 datapath/dp_sysfs.h                                |   28 +
 datapath/{brc_sysfs_dp.c => dp_sysfs_dp.c}         |   81 +-
 datapath/{brc_sysfs_if.c => dp_sysfs_if.c}         |   55 +-
 datapath/linux-2.6/.gitignore                      |    4 +-
 datapath/linux-2.6/Modules.mk                      |    7 +-
 .../linux-2.6/compat-2.6/include/linux/kobject.h   |   25 +-
 .../linux-2.6/compat-2.6/include/linux/netdevice.h |    3 +-
 debian/openvswitch-switch.template                 |    6 +-
 include/openvswitch/brcompat-netlink.h             |    7 +-
 include/openvswitch/datapath-protocol.h            |   22 +-
 lib/cfg.c                                          |    7 +
 lib/cfg.h                                          |    1 +
 lib/daemon.c                                       |   28 +-
 lib/daemon.h                                       |   28 +-
 lib/daemon.man                                     |   33 +-
 lib/dhcp-client.c                                  |    6 +-
 lib/dhcp.h                                         |    4 +
 lib/ofp-print.c                                    |    6 +-
 lib/ofp-print.h                                    |    6 +
 lib/rconn.c                                        |    4 +-
 lib/svec.h                                         |    9 +
 lib/vlog.c                                         |    2 +-
 ofproto/fail-open.c                                |    5 +-
 ofproto/netflow.c                                  |    2 +-
 ofproto/ofproto.c                                  |  149 ++-
 ofproto/ofproto.h                                  |    1 +
 utilities/ovs-cfg-mod.c                            |    1 +
 utilities/ovs-discover.8.in                        |   17 +-
 utilities/ovs-discover.c                           |   15 +-
 utilities/ovs-dpctl.8.in                           |    6 +-
 utilities/ovs-dpctl.c                              |   29 +-
 utilities/ovs-openflowd.8.in                       |    4 +-
 utilities/ovs-openflowd.c                          |    7 +-
 vswitchd/bridge.c                                  |  154 ++-
 vswitchd/mgmt.c                                    |   22 +-
 vswitchd/ovs-brcompatd.c                           |  284 ++++-
 vswitchd/ovs-vswitchd.c                            |    6 +-
 vswitchd/ovs-vswitchd.conf.5.in                    |   24 +-
 vswitchd/proc-net-compat.c                         |    6 +
 vswitchd/proc-net-compat.h                         |    9 +
 xenserver/README                                   |    4 +
 xenserver/automake.mk                              |    1 +
 xenserver/etc_init.d_vswitch                       |   32 +-
 xenserver/etc_sysconfig_vswitch.example            |   10 +-
 xenserver/etc_xensource_scripts_vif                |    8 +-
 .../opt_xensource_libexec_interface-reconfigure    |  228 +++-
 xenserver/usr_sbin_xen-bugtool                     | 1451 ++++++++++++++++++++
 xenserver/vswitch-xen.spec                         |   32 +-
 55 files changed, 2612 insertions(+), 590 deletions(-)
 delete mode 100644 datapath/brc_sysfs.h
 create mode 100644 datapath/dp_sysfs.h
 rename datapath/{brc_sysfs_dp.c => dp_sysfs_dp.c} (83%)
 rename datapath/{brc_sysfs_if.c => dp_sysfs_if.c} (89%)
 create mode 100755 xenserver/usr_sbin_xen-bugtool


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list