[ovs-git] Open vSwitch: Merge commit 'origin/citrix' (master)

nicira-dev at nicira.com nicira-dev at nicira.com
Wed Jul 29 05:17:38 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  a5e54d9b6f8002f34cc792df69e6eda68cf95223 (commit)
       via  3cdc31a4c3ab312cf41b00845d1316aff181ab1b (commit)
       via  42a9c78baca62833d0eafcfa0ad44e079ebf3b86 (commit)
       via  2b35e1475ef0c274495aa04d60b054288971d503 (commit)
       via  7a3696adbfe26cfbe515b3d3564d2e4a08096b2c (commit)
       via  c735214e852e1706a3e0ad346c114292fd3e7047 (commit)
       via  092bebdc047b8a4944762a454ff8653baa563ced (commit)
       via  867fb42cba19c25cfbe4f6752ebd3e44c29be2a1 (commit)
      from  4cff83cbad9c0ccd8575a001c7345066a2e6fa00 (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 a5e54d9b6f8002f34cc792df69e6eda68cf95223
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch/.git;a=commitdiff;h=a5e54d9b6f8002f34cc792df69e6eda68cf95223
Author: Justin Pettit <jpettit at nicira.com>
		
Merge commit 'origin/citrix'
		
Conflicts:

	configure.ac


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

Summary of changes:
 debian/openvswitch-switch-config.templates         |    8 +-
 debian/openvswitch-switch.init                     |    2 +-
 debian/openvswitch-switch.template                 |    4 +-
 debian/po/templates.pot                            |    8 +-
 lib/cfg.c                                          |   19 ++++
 lib/cfg.h                                          |    2 +
 lib/socket-util.c                                  |   21 ++----
 lib/vconn.c                                        |    8 +-
 utilities/ovs-controller.8.in                      |   19 ++--
 utilities/ovs-ofctl.8.in                           |   19 ++--
 utilities/ovs-openflowd.8.in                       |   24 +++---
 vswitchd/bridge.c                                  |    7 +-
 vswitchd/ovs-brcompatd.c                           |   88 ++++++++++++++++++--
 vswitchd/ovs-vswitchd.conf.5.in                    |   33 ++++----
 .../opt_xensource_libexec_interface-reconfigure    |   22 +++++
 ..._lib_xsconsole_plugins-base_XSFeatureVSwitch.py |   23 ++++--
 16 files changed, 212 insertions(+), 95 deletions(-)


hooks/post-receive
-- 
Open vSwitch




More information about the git mailing list