Reviewed:  https://review.openstack.org/225540
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=1936299943116abcedd8b36fb8b64c724e539ab7
Submitter: Jenkins
Branch:    feature/crypto

commit 9e95613d717489da584531e220db20d1b8f43c51
Author: Alistair Coles <email address hidden>
Date:   Mon Sep 21 10:01:54 2015 +0100

    Fix .coveragrc to prevent nose tests error
    
    Since v4.0 the coverage package raises an error if unrecognized
    options are found in .coveragrc [1]. Previously they were ignored. The
    ignore-errors option therefore causes nosetests with coverage to error
    because the option should be ignore_errors (underscore not hyphen).
    
    [1] https://bitbucket.org/ned/coveragepy/src/tip/CHANGES.rst
    
    Change-Id: Ic488801b7cc43217f9e2a4ed945e06505b667608

commit 1fe8e4327b15f8933efef185d09b6067d1f28716
Author: Clay Gerrard <email address hidden>
Date:   Fri Sep 18 13:54:52 2015 -0700

    Fix recon tests on SAIO with multiple policies
    
    Recon middleware used to only look on rings that exist on disk when it was
    started, so if a test didn't create a ring in the temp swift_dir it can expect
    the middleware to not report it.
    
    However, after we started looking at policies to determine rings [1] - we need
    to be more careful to patch policies to match up with the test requirements.
    On development environments with only the legacy default polices the existing
    recon tests were passing by accident - but not in my environment.
    
    This change will patch policies for the TestCase so that tests will pass for
    me.  Individual test methods that have more specific policy requirements for
    the test can continue to @patch_policies just for those tests but in general
    the existing test_methods all seem to expect legacy policies - so we just make
    the default for the TestCase legacy_only.
    
    Change-Id: I778a0a59091ca8870e1cab985f3ec426eb045ab7

commit a63f70c17d392379ec75045a94c38a96878b4c5c
Author: Minwoo Bae <email address hidden>
Date:   Wed Sep 9 15:33:45 2015 -0500

    Reconstructor logging to omit 404 warnings
    
    Currently, the replicator does not log warning messages
    for 404 responses. We would like the reconstructor to
    do the same, as 404s are not considered unusual, and
    are already handled by the object server.
    
    Change-Id: Ia927bf30362548832e9f451923ff94053e11b758
    Closes-Bug: #1491883

commit 530102ae07ea27b4a994e4b1fb2f590700cfef0c
Author: Bill Huber <email address hidden>
Date:   Mon Sep 14 16:01:39 2015 -0500

    Update EC Support on how to build an EC ring with replicas count
    
    This doc is being updated to specify the replicas count parameter
    to build an EC ring that enforces both data and parity placements
    for each partition.
    
    Change-Id: I770ad268e4017e610be3357e89b89f0b7d3c18af
    Closes-Bug: 1487203

commit 0d9142abd45f189b15eaec1a25464ed7d1859f97
Author: Clay Gerrard <email address hidden>
Date:   Mon Sep 14 17:17:29 2015 -0700

    Fix typo in Deployment Guide and add some formatting
    
    Change-Id: I58703162bf3e9f39656a5e511bd8fe845793bca2

commit 460a7e4b64d134d1fd47f09924d594196b6458d4
Author: Brian Cline <email address hidden>
Date:   Wed Sep 2 04:13:29 2015 -0500

    Fixes recon bug with initially missing rings
    
    Previously the recon middleware was doing a basic scan for object
    rings that exist at init time. In situations where an object-server
    was started without an object ring present, but received one shortly
    after, recon still would not report it in the /recon/ringmd5 response.
    This persists even when object-server gleefully chugs along after
    picking up the ring, and recon's behavior would only be corrected by
    an object-server reload/restart.
    
    This change brings the middleware a bit more up to date to use the
    common POLICIES instance to determine what policies were already loaded
    based on configuration, and derives the path for each ring.
    
    This effectively makes the config the source of truth for what rings
    *should* be present, rather than what's present at startup. Since we
    already dynamically check in ReconMiddleware.get_ring_md5 whether each
    of the predetermined ring files exist, recon now correctly reports a
    previously-missing ring whenever it falls into place.
    
    Change-Id: Ia079418e54ffac5e01ef6a15511f5069b7fe83ea

commit 9324ce83c6dcbf5fb4ffefdc781eec5db1b946c9
Author: Bill Huber <email address hidden>
Date:   Tue Sep 8 16:11:33 2015 -0500

    Reconstructor GET excludes user_agent in log
    
    To make it easier for users to deduce in the log to find out
    where the request originates from, it is necessary to include
    the user_agent field in the reconstructor for a GET method
    and to have this particular log consistent with other servers'
    methods.
    
    Change-Id: I0ca7443436e97c2db64c966ab4d73c5c12a1f059
    Closes-Bug: 1491871
    Co-Authored-By: Kota Tsuyuzakai <email address hidden>

commit 369447ec47dc8df3e38046a305cf1aa0a6499ce9
Author: Clay Gerrard <email address hidden>
Date:   Thu Aug 27 15:09:29 2015 -0700

    Fix purge for tombstone only REVERT job
    
    When we revert a partition we normally push it off to the specific
    primary node for the index of the data files in the partition.  However,
    when a partition is devoid of any data files (only tombstones) we build
    a REVERT job with a frag_index of None.
    
    This change updates the ECDiskFile's purge method to be robust to
    purging tombstones when the frag_index is None.
    
    Add probetest to validate tombstone only revert jobs will clean
    themselves up if they can validate they're in-sync with part-replica
    count nodes - even if one of the primaries is down (in which case they
    sync tombstones with other handoffs to fill in for the primaries)
    
    Change-Id: Ib9a42f412fb90d51959efce886c0f8952aba8d85

commit a3facce53cac0497edb326a93a97f24e02c603ab
Author: paul luse <email address hidden>
Date:   Thu Aug 27 11:02:27 2015 -0700

    Fix invalid frag_index header in ssync_sender when reverting EC tombstones
    
    Back in d124ce [1] we failed to recognize the situation where a revert
    job would have an explicit frag_index key wth the literal value None
    which would take precedence over the dict.get's default value of ''.
    Later in ssync_receiver we'd bump into the ValueError converting 'None'
    to an int (again).
    
    In ssync_sender we now handle literal None's correctly and should
    hopefully no longer put this invalid headers on the wire - but for belts
    and braces we'll also update ssync_receiver to raise a 400 series error
    and ssync_sender to better log the error messages.
    
    1. https://review.openstack.org/#/c/195457/
    
    Co-Author: Clay Gerrard <email address hidden>
    Co-Author: Alistair Coles <email address hidden>
    Change-Id: Ic71ba7cc82487773214030207bb193f425319449
    Closes-Bug: 1489546

commit 71f6fd025ea013bc457450a5cc4f8e92c6df92cc
Author: Romain LE DISEZ <email address hidden>
Date:   Tue Jun 16 12:47:26 2015 +0200

    Allows to configure the rsync modules where the replicators will send data
    
    Currently, the rsync module where the replicators send data is static. It
    forbids administrators to set rsync configuration based on their current
    deployment or needs.
    
    As an example, the rsyncd configuration example encourages to set a connections
    limit for the modules account, container and object. It permits to protect
    devices from excessives parallels connections, because it would impact
    performances.
    
    On a server with many devices, it is tempting to increase this number
    proportionally, but nothing guarantees that the distribution of the connections
    will be balanced. In the worst scenario, a single device can receive all the
    connections, which is a severe impact on performances.
    
    This commit adds a new option named 'rsync_module' to the *-replicator sections
    of the *-server configuration file. This configuration variable can be
    extrapolated with device attributes like ip, port, device, zone, ... by using
    the format {NAME}. eg:
        rsync_module = {replication_ip}::object_{device}
    
    With this configuration, an administrators can solve the problem of connections
    distribution by creating one module per device in rsyncd configuration.
    
    The default values are backward compatible:
        {replication_ip}::account
        {replication_ip}::container
        {replication_ip}::object
    
    Option vm_test_mode is deprecated by this commit, but backward compatibility is
    maintained. The option is only effective when rsync_module is not set. In that
    case, {replication_port} is appended to the default value of rsync_module.
    
    Change-Id: Iad91df50dadbe96c921181797799b4444323ce2e

commit cb683d391cb66d0f52830de16760c80fd2afedf9
Author: OpenStack Proposal Bot <email address hidden>
Date:   Sat Sep 5 06:17:51 2015 +0000

    Imported Translations from Transifex
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I2d92b8e34a665fb0bb4c048cfb0c59de295dfce6

commit e4542455c8a07b7981c247df8b737816062c1655
Author: Emett Speer <email address hidden>
Date:   Wed Sep 2 17:18:03 2015 -0700

    [Labs] Update links to Cloud Admin Guide
    
    Update links to the Cloud Admin Guide after the
    RST conversion of that book altered URLs.
    
    Change-Id: I899f8938498b744e62887968a65e58c00ef27f1b

commit 58fcc07523978306cd3889ada73af5d9e664cf59
Author: Christian Schwede <email address hidden>
Date:   Wed Sep 2 10:52:34 2015 +0000

    Test if container_sweep is executed on unmounted devices
    
    This change ensures that container_sweep is not run if a device is not mounted
    and mount_check is set to True.
    
    Change-Id: I823083c8431d9e61fd426508033ec9188503957b

commit 615c7a204b9386e05c5bab658bfe96766ad1e680
Author: Brian Cline <email address hidden>
Date:   Tue Sep 1 10:51:20 2015 -0500

    Adds useful dispersion info from changelog
    
    Change-Id: I1a45088fc32620b02ff9a754b02ec1eb75a59d6e

commit 3b8755098a1786c5447abf158bd686293a82977c
Author: janonymous <email address hidden>
Date:   Sun Aug 2 21:29:13 2015 +0530

    Replace a / b with a // b to use integer division where needed
    
    Change-Id: I72c81faa62786e140b0de00e3a04934bf1b5adbd

commit 58a10a5fffec69304d7bcce0f1c43bd2a9f9ff52
Author: Alistair Coles <email address hidden>
Date:   Wed Aug 26 16:30:23 2015 +0100

    Add test that a tempurl POST cannot set a DLO manifest header
    
    Follow up to [1] to add tests for tempurl POSTs not being allowed
    to set a DLO manifest header.
    
    [1] I11e68830009d3f6bff44ae4011a41b67139146f6
    
    Change-Id: I7c0ad5a936f71e56c599b8495a586913d3334422
    Related-Bug: 1453948

commit 4765189ef3f67b3f709c3141f222e15c6d89a62d
Author: Carlos Cavanna <email address hidden>
Date:   Thu Jul 9 23:10:05 2015 -0400

    Improving statistics sent to Graphite.
    
    Currently, statistics are organized by command. However, it would also be
    useful to display statistics organized by policy. Different policies may be
    based on different storage properties (ie, faster disks).
    With this change, all the statistics for object timers will be sent per policy
    as well.
    Policy statistics reporting will use policy index and the name in Graphite will
    show as proxy-server.object.policy.<policy-index>.<verb>, etc.
    Updated unit tests for per-policy stat reporting and added new unit tests for
    invalid cases.
    Updated documentation in the Administrator's Guide to reflect this new
    aggregation.
    
    Change-Id: Id70491e4833791a3fb8ff385953d69018514cd9c

commit 5b01c5eadc3a13607d2581a55007700fca0b00af
Author: Bill Huber <email address hidden>
Date:   Fri Aug 7 16:24:28 2015 -0500

    Add unit test for container_update for unmounted device
    
    This unit test case gains coverage for container/update.py
    where a device (i.e. sda1) is not mounted and the code
    responds with a warning logger that the device is not
    mounted and continues.  Coverage increases 2% as a result.
    
    Change-Id: I33d247a930b28604093df4ade1ce7dbbd24aac54