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

[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, wdp has been updated
       via  b9e6283c97464acb188818db8f453d2edaef037e (commit)
       via  9575eae3724fb437b2df9bfad02501325d3dcdaf (commit)
       via  823c5699d4de7bf726f988e1ca6197fb2400f388 (commit)
       via  169e3808f7c510a048589d8e658336919079a6a0 (commit)
       via  bc31db1fef627145149241281f33a92025ae50d5 (commit)
       via  7febb9100b6a63aab46f8850de6de335f8a47345 (commit)
       via  b33c0ddb28655b5cc0dd851d3e26829a961c0e3d (commit)
       via  106eab5dfd26c4739d7781e7aee50a8cc27ff8bd (commit)
       via  1e82e503c5358f8dce9eb2105448f0ec894d57bc (commit)
       via  61b999dd6fa3a8942b5002f9392a0068324a80b6 (commit)
       via  92df599cb2bc5b04a5c9da3e7002f4c729ba480c (commit)
      from  ba5c210e41cfc0b23abdc525634470137be65000 (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 b9e6283c97464acb188818db8f453d2edaef037e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=b9e6283c97464acb188818db8f453d2edaef037e
Author: Ben Pfaff <blp at nicira.com>
		
Merge "master" branch into "wdp".
		


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

Summary of changes:
 datapath/vport-netdev.c                            |   81 ++++----------------
 lib/dhcp-client.c                                  |    2 -
 lib/learning-switch.c                              |    5 +-
 lib/mac-learning.c                                 |   59 ++++++++++-----
 lib/mac-learning.h                                 |   20 ++++-
 lib/netdev-linux.c                                 |   44 ++++++-----
 lib/netdev.c                                       |   35 ++-------
 lib/netdev.h                                       |    2 -
 lib/xfif-netdev.c                                  |    3 -
 ofproto/wdp-xflow.c                                |    2 -
 utilities/ovs-openflowd.c                          |    6 --
 vswitchd/bridge.c                                  |   59 ++++++++------
 xenserver/etc_init.d_openvswitch                   |    9 ++-
 .../etc_xapi.d_plugins_openvswitch-cfg-update      |    9 ++
 .../opt_xensource_libexec_InterfaceReconfigure.py  |   12 ++-
 ...ensource_libexec_InterfaceReconfigureVswitch.py |   11 +++
 .../opt_xensource_libexec_interface-reconfigure    |    9 ++-
 xenserver/ovs-xenserverd.c                         |    2 +-
 ...sr_share_openvswitch_scripts_sysconfig.template |    5 +
 19 files changed, 188 insertions(+), 187 deletions(-)


hooks/post-receive
-- 
Open vSwitch