[ovs-git] Open vSwitch: Merge commit 'v0.90.6' into citrix (citrix)

[dev at openvswitch.org]

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, citrix has been updated
       via  e7f327ff6bd90bb0ce695ca71054d17829a16888 (commit)
       via  ef5925df6af03cf47a4931539016715f6ac3f661 (commit)
       via  2b71f0116078b38b2bee0538b4633e19996badfe (commit)
      from  9e5ce56ddbe26c0fc250ac0b2e030f247689abdc (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 e7f327ff6bd90bb0ce695ca71054d17829a16888
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e7f327ff6bd90bb0ce695ca71054d17829a16888
Author: Justin Pettit <jpettit at nicira.com>
		
Merge commit 'v0.90.6' into citrix
		


commit ef5925df6af03cf47a4931539016715f6ac3f661
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=ef5925df6af03cf47a4931539016715f6ac3f661
Author: Justin Pettit <jpettit at nicira.com>
		
Prepare for v0.90.6 release.
		


commit 2b71f0116078b38b2bee0538b4633e19996badfe
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=2b71f0116078b38b2bee0538b4633e19996badfe
Author: Ben Pfaff <blp at nicira.com>
		
xenserver: Add script refresh-xs-network-uuids.
		
On pool join, the bridge.<bridge>.xs-network-uuids key is not updated
properly for the primary management interface.  We don't have a proper
fix for this problem yet, and probably won't ever have one for XenServer
5.5.0, so this commit adds a script that works around the problem.
Running the script is a shortcut for rebooting the XenServer host,
which should also solve the problem.

Bug #2097.


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

Summary of changes:
 ChangeLog                                          |    4 ++++
 configure.ac                                       |    2 +-
 xenserver/README                                   |    6 ++++++
 xenserver/automake.mk                              |    1 +
 .../root_vswitch_scripts_refresh-xs-network-uuids  |   12 ++++++++++++
 xenserver/vswitch-xen.spec                         |    3 +++
 6 files changed, 27 insertions(+), 1 deletions(-)
 create mode 100755 xenserver/root_vswitch_scripts_refresh-xs-network-uuids


hooks/post-receive
-- 
Open vSwitch