[ovs-dev] [branch-1.1 00/34] commits to cherry-pick for branch-1.1

Justin Pettit jpettit at nicira.com
Fri Apr 29 22:19:58 UTC 2011


The list looks good to me.  A few of these don't appear to be bug fixes per se (e.g., "bridge: Monitor fewer OVSDB columns."), but it may make later cherry picks easier, so I'm not opposed to using them.  You may just want to adjust the description below (or not).

--Justin


On Apr 29, 2011, at 2:56 PM, Ben Pfaff wrote:

> These are the bug fix commits that I think should be pushed to
> branch-1.1.  All of them are already on "master", so it is only
> necessary to decide whether you agree with my selections.  Comments
> appreciated.
> 
> Andrew Evans (2):
>  pcap: Silence warnings about fwrite(3) return value being ignored.
>  datapath: Make git ignore linux-2.6/vlan.c.
> 
> Ben Pfaff (28):
>  type-props: New macro for estimating length of a decimal integer.
>  signals: New function signal_name().
>  util: New function ovs_fatal_valist().
>  Log anything that could prevent a daemon from starting.
>  daemon: Tolerate EINTR in fork_and_wait_for_startup().
>  daemon: Integrate checking for an existing pidfile into
>    daemonize_start().
>  daemon: Avoid races on pidfile creation.
>  ovsdb-idl: Fix atomicity of writes that don't change a column's
>    value.
>  bridge: Monitor fewer OVSDB columns.
>  debian: Do not call obsolete command "ovs-ofctl status" in
>    ovs-bugtool.
>  ovsdb-idl: Suppress "delete" operations for garbage-collected tables.
>  vswitchd: Document how to disable inactivity probes.
>  Fix calls to ctype functions.
>  ofproto: Avoid memory leak in classifier on destruction.
>  bridge: Initialize mirrors' uuid member.
>  daemon: Reduce log level of "pid file is stale" message.
>  bridge: Reintroduce log message that was lost (and wrong).
>  bridge: Fix VLAN selection mirroring logic.
>  socket-util: Properly set socket permissions in make_unix_socket().
>  ofp-util: Properly handle "tun_id"s in tun_id_from_cookie flows.
>  bridge: Avoid memory leak from RSPAN mirrors in bridge_destroy().
>  INSTALL.Linux: Mention that SSL options require building with SSL
>    support.
>  socket-util: Use portable solution for setting Unix socket
>    permissions.
>  ofproto: Consistently use netdev's name instead of ofp_phy_port name.
>  ofproto: Rework and fix bugs in port change detection.
>  bridge: Tolerate missing Port and Interface records for local port.
>  ofproto: Adjust netdev_monitor when switching netdevs.
>  datapath: Avoid freeing wild pointer in corner case.
> 
> Ethan Jackson (3):
>  xenserver:  Warn when upgrading OVS on a bridged system.
>  xenserver: Don't openvswitch-xapi-update in bridge mode.
>  xenserver: Fix typo in RPM install message.
> 
> Justin Pettit (1):
>  ovs-monitor-ipsec: Allow IKE fragmentation
> 
> AUTHORS                                            |    3 +
> INSTALL.Linux                                      |    3 +
> datapath/flow.c                                    |    1 +
> datapath/linux-2.6/.gitignore                      |    1 +
> debian/ovs-bugtool                                 |    3 +-
> debian/ovs-monitor-ipsec                           |    5 +-
> lib/command-line.c                                 |   19 +-
> lib/daemon.c                                       |  278 ++++++++++++--------
> lib/daemon.h                                       |    1 -
> lib/entropy.c                                      |    5 +-
> lib/fatal-signal.c                                 |   11 +-
> lib/ofp-parse.c                                    |    3 +-
> lib/ofp-print.c                                    |    2 +-
> lib/ofp-util.c                                     |    2 +-
> lib/ovsdb-idl.c                                    |   44 +++-
> lib/ovsdb-idl.h                                    |    4 +-
> lib/pcap.c                                         |    6 +-
> lib/process.c                                      |   38 +--
> lib/random.c                                       |    7 +-
> lib/signals.c                                      |   52 ++++-
> lib/signals.h                                      |    8 +-
> lib/socket-util.c                                  |   23 ++-
> lib/socket-util.h                                  |    4 +-
> lib/timeval.c                                      |   25 +-
> lib/timeval.h                                      |    4 +-
> lib/type-props.h                                   |    9 +-
> lib/util.c                                         |    9 +-
> lib/util.h                                         |    2 +
> lib/uuid.c                                         |    7 +-
> lib/vlog.c                                         |   27 ++-
> lib/vlog.h                                         |   13 +-
> ofproto/ofproto.c                                  |  230 +++++++++-------
> ovsdb/ovsdb-server.c                               |    1 -
> python/ovs/daemon.py                               |  201 +++++++++------
> tests/ofproto.at                                   |    8 +-
> tests/test-daemon.py                               |    5 +-
> tests/test-jsonrpc.c                               |    2 -
> tests/test-jsonrpc.py                              |    4 +-
> tests/test-timeval.c                               |    4 +-
> tests/test-type-props.c                            |   13 +-
> utilities/ovs-controller.c                         |    1 -
> utilities/ovs-dpctl.c                              |   11 +-
> utilities/ovs-ofctl.c                              |   19 +-
> utilities/ovs-openflowd.c                          |   45 ++--
> utilities/ovs-vsctl.8.in                           |   13 +-
> vswitchd/bridge.c                                  |  137 +++++++---
> vswitchd/ovs-brcompatd.c                           |   19 +-
> vswitchd/ovs-vswitchd.c                            |    5 +-
> vswitchd/vswitch.xml                               |    4 +-
> xenserver/etc_init.d_openvswitch-xapi-update       |   17 ++
> xenserver/openvswitch-xen.spec                     |   15 +-
> .../usr_share_openvswitch_scripts_ovs-xapi-sync    |    2 -
> 52 files changed, 856 insertions(+), 519 deletions(-)
> 
> -- 
> 1.7.4.4
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev




More information about the dev mailing list