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

[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, master has been updated
       via  d17ee8689bff22541dccaa792b70a848641f3646 (commit)
       via  0cd8a05ec036ca8f950d4d4034a80bf485581b6a (commit)
       via  5ef800a6909fabfb2331a2da90450c23ca61aa06 (commit)
       via  8fe1a59d281369829f474dc75eb5905c991ccd94 (commit)
       via  42c3641cc473cfb3ae7d80363835da7df85cad2e (commit)
       via  c4b1912e822a579d72e01fcff70d06a2c84c0306 (commit)
       via  14986b312eebf556c20e03b49fbff51859e38c5a (commit)
       via  f1bd68ab587edcbf6d6702c1843eba286db190ab (commit)
       via  42061b2a5b79d44c0ff9442a8203f0c7672ee9cf (commit)
       via  e96a4d8035367297f1d19a70e59976a20bf72517 (commit)
       via  46d6f36f042e5a23d1548ca4d2f1c8eeca9031ca (commit)
      from  7c9e113b712e72fcb4ccc6075da7334cb3391059 (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 d17ee8689bff22541dccaa792b70a848641f3646
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=d17ee8689bff22541dccaa792b70a848641f3646
Author: Ben Pfaff <blp at nicira.com>
		
Merge citrix branch into master.
		


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

Summary of changes:
 datapath/actions.c                                 |   32 +-
 datapath/actions.h                                 |    1 -
 ofproto/ofproto.c                                  |   39 +-
 vswitchd/bridge.c                                  |  146 ++++--
 xenserver/LICENSE                                  |  523 ++++++++++++++++++++
 xenserver/etc_init.d_vswitch                       |    3 +-
 xenserver/etc_xensource_scripts_vif                |   18 +-
 .../opt_xensource_libexec_interface-reconfigure    |   15 +-
 8 files changed, 697 insertions(+), 80 deletions(-)
 create mode 100644 xenserver/LICENSE


hooks/post-receive
-- 
Open vSwitch