Reviewed:  https://review.openstack.org/208513
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=942c9bb45c6b8124bcaa407eb9b9ac7f0589c743
Submitter: Jenkins
Branch:    feature/crypto

commit 207dd9b49d7d53a9faa4849af2c40bb875416fce
Author: Darrell Bishop <email address hidden>
Date:   Thu Jul 30 14:32:08 2015 -0700

    Fix regression in WSGI server SIGHUP behavior
    
    The SIGHUP receipt used to pop us out of an os.wait() where now, it's in
    a "green" wait() and Timeout() combo, some part of which eats the signal
    receipt.  This causes the while loop condition to never get checked and
    SIGHUP no longer works as a server reload command.
    
    The fix is to loop at least every 0.5 seconds, as a trade-off between
    not busy-waiting and checking the "keep running" condition often enough
    to feel responsive.
    
    Change-Id: I95283b8b7cfc2998ab5813e0ad3ca1fa231696c8
    Closes-Bug: #1479972

commit bcd00d9461603db1477c5f1e9f8dd6405a319eb9
Author: Alistair Coles <email address hidden>
Date:   Mon Jun 8 19:40:56 2015 +0100

    Refactor diskfile
    
    This patch mostly eliminates the duplicate code that was
    deliberately left in place during EC review to avoid major
    churn of the diskfile module prior to the kilo release.
    
    This focuses on obvious de-duplication and shuffling code
    between classes. It deliberately does not attempt to
    hammer out every last piece of de-duplication where that
    would introduce more complex changes - that can come later.
    
    Code is moved from the module level and from ECDiskFile*
    classes into new BaseDiskFile* classes.
    
    Concrete classes for replication and EC policy retain their
    existing names i.e. DiskFile[Manager|Writer|Reader|] and
    ECDiskFile[Manager|Writer|Reader|] respectively.
    
    Knock-on changes:
    
    - fix bug whereby get_hashes was ignoring self.reclaim_age
      and always using the default arg value.
    
    - replication diskfile manager now deletes a tombstone that is older
      than reclaim_age even when there is a newer .meta file.
    
    - replication diskfile manager will no longer raise an
      AssertionError if only a .meta file is found during
      hash_cleanup_listdir.
    
    - fix stale test in test_auditor.py: test_with_tombstone test
      setup was convoluted (probably dates back to when object puts
      did not clean up the object dir). Now that they do you have to
      try harder to create a dir with a tombstone and a data file.
    
    Change-Id: I963e0d0ae0d6569ad1de605034c529529cbb4f9a

commit 9cb7eb4a4b6cdab8a5f16b3dc800b39ab4068522
Author: Victor Stinner <email address hidden>
Date:   Mon Jul 27 11:34:07 2015 +0200

    Update hacking to 0.10.0
    
    Replace the whitelist of flake8 checks (select) with a blacklist
    (ignore).  It makes possible to disable a single check, which was not
    possible before. This new approach permits to enable new tests more
    easily and see which checks are currently disabled.
    
    Only new checks are disabled, this change doesn't run less checks than
    before. Currently, many checks are disabled, but following changes will
    fix these new warnings.
    
    When the "select" option of flake8 is used in tox.ini, the "ignore"
    option is ignored. It is not possible to use "select" and "ignore"
    options at the same time. See the code in pep8 (flake8 is based on
    pep8):
    
    https://github.com/PyCQA/pep8/blob/d48eef071003952ed0f98445dc3dc6bc29618f9c/pep8.py#L1808
    
    The purpose of flake8 is to enhance the coding style, but also to help
    to detect common bugs. Blacklisting checks permits to detect new bugs
    when upgrading the tools. For example, new checks were recently added to
    help porting code to Python 3.
    
    This change permits to use pbr 1.0 and newer which is required to
    support Python 3. Previously, hacking 0.8.1 was used, but hacking 0.8 is
    incompatible with pbr 1.0 and newer (hacking 0.8 requires pbr<1.0).
    
    pbr 1.0 is required to use environment markers on requirements to
    install dnspython on Python 2 and dnspython3 on Python 3.
    
    Change-Id: I41d63b9467083d7606ad18aaa398ca7738b27fae

commit 389a97e3526df68121cecfaf1909343b5d381cbc
Author: Victor Stinner <email address hidden>
Date:   Wed Jul 29 23:46:58 2015 +0200

    Fix pep8 E warning for hacking 0.10
    
    Fix pep8 warnings of the E category of hacking 0.10:
    
    * E113: unexpected indentation
    * E121: continuation line under-indented for hanging indent
    * E122: continuation line missing indentation or outdented
    * E123: closing bracket does not match indentation of opening bracket's
      line
    * E126: continuation line over-indented for hanging indent
    * E251: unexpected spaces around keyword / parameter equals
    
    Change-Id: I0b24eebdf1a37dc1b572b6c9a3d3d4832d050237

commit d719064e788ec5fa70305fadaa46affcb603a9bb
Author: Victor Stinner <email address hidden>
Date:   Thu Jul 30 00:28:44 2015 +0200

    Fix warning pep8 E128 warning of hacking 0.10
    
    Fix the warning E128: "continuation line under-indented for visual
    indent" of pep8.
    
    Change-Id: Ie6c6ae341fe3d6281f2095c1d756d552fa5937f9

commit a0db56dcde83096708e6fe64ae9338098e0ba98a
Author: Victor Stinner <email address hidden>
Date:   Thu Jul 30 00:16:06 2015 +0200

    Fix pep8 E265 warning of hacking 0.10
    
    Fix the warning E265 "block comment should start with '# '" added in pep
    1.5.
    
    Change-Id: Ib57282e958be9c7cddffc7bca34fbbf1d4c460fd

commit 345785837f1caa01fec5bca091c70481d7069bea
Author: Charles Hsu <email address hidden>
Date:   Thu Jul 30 13:11:00 2015 +0800

    Remove error_suppression_interval, error_suppression_limit options.
    
    These two options is belong to proxy-server, not account-replicator.
    
    Change-Id: Ie030ecffd213e56db32df77c69b847479d96308f

commit 5a7383313b1c555df5fd47050f7ee3810b5e31fc
Author: Carlos Cavanna <email address hidden>
Date:   Tue Jul 28 19:15:25 2015 -0400

    Swift documentation for first-time contributors.
    
    In this change, there are proposed improvement to Swift documentation aimed at
    first-time contributors. They include a simplification of the Getting
    Started page and a new page with some basic instructions/commands that the
    first-time contributor should know. In addition, it shows some common errors
    that the first-time contributor may find when executing git rebase and
    information on how to track your changes.
    
    Change-Id: I704202955093736b2f3b4102a649690a0392c6b0

commit 5b5c8820024141bc6ae49d7646a92fb53667ea9b
Author: Alistair Coles <email address hidden>
Date:   Wed Jul 29 12:36:35 2015 +0100

    Remove unused code in swift/obj/server.py
    
    keep_cache was defined twice
    
    Change-Id: I5f775f618669e3dabfc3bc54dd7bd2cd7f00b2f0

commit 0c27cb07caf1027cd9734e8bd34d9759da33e667
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed Jul 29 06:36:01 2015 +0000

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

commit 117b61976fbf14d8a0d2157256f9a3230421ee72
Author: Samuel Merritt <email address hidden>
Date:   Wed Jul 22 15:40:55 2015 -0700

    functests: use assertIn and assertNotIn
    
    We have a bunch of assertions like
    
        self.assertTrue(resp.status in (200, 204))
    
    Sometimes we get smart about failure messages and have something like
    
        self.assertTrue(resp.status in (200, 204), resp.status)
    
    so we can see what the status was when it failed.
    
    Since we don't have to support Python 2.6 any more, we can use
    assertIn/assertNotIn and get nice failure messages for free.
    
    Change-Id: I2d46c9969d41207a89e01017b4c2bc533c3d744f

commit 8fe8bee7e0c5c9d34d7a8e6ab090c8d65c5ca78e
Author: janonymous <email address hidden>
Date:   Tue Jul 21 18:06:32 2015 +0530

    test/(functional, probe): Replace "self.assert_" by "self.assertTrue"
    
    The assert_() method is deprecated and can be safely replaced by assertTrue().
    This patch makes sure that running the tests does not generate warnings
    all over the screen.
    
    Change-Id: I74705c6498249337bfdf955d62e0ad972035bc1f

commit 4a6e0ccc69302a5384b988149e294656323d7f20
Author: Samuel Merritt <email address hidden>
Date:   Mon Jul 20 11:58:35 2015 -0700

    Rename WsgiStringIO -> WsgiBytesIO.
    
    If we're going to have a subclass of BytesIO, having "StringIO" in its
    name is just asking for confusion.
    
    Change-Id: I695ab3105b1a02eb158dcf0399ae91888bc1c0ac

commit 5ee742c17d9ea92ca7332cb67db0cce64b7a0d8f
Author: janonymous <email address hidden>
Date:   Fri Jul 24 21:19:47 2015 +0530

    Modifying Lambda function tuple usage for python3
    
    Current tuple unpacking is not supported in python3
    
    Change-Id: I15a8e977684d19154cf2233caf1174f6983ac9e2

commit 6f89f71f9ba11f7b4126b80076a0f13792332e1e
Author: Alistair Coles <email address hidden>
Date:   Wed Apr 15 16:17:23 2015 +0100

    Filter Etag key from ssync replication-headers
    
    ssync rx sends a header X-Backend-Replication-Headers whose value is a
    list of headers that the source object has. This list extends the list
    of allowed headers on the target object server, so that the target
    object metadata is faithfully reconstructed to match the source.
    
    Unfortunately the combination of lower() and title() operations on
    header keys results in the source 'ETag' value being added to the target
    metadata under the key 'Etag' in addition to the 'ETag' key that the
    receiving server adds (note different capitilization), both having
    the same value.
    
    The spurious 'Etag' metadata is potentially confusing for humans
    inspecting the object metadata and complicates tests that wish to
    assert the equality of two object metadata dicts. See for example the
    test in test_ssync_sender.py that this patch cleans up.
    
    Furthermore, the possibility of having both Etag and ETag keys has
    required a workaround in the EC reconstructor [1].
    
    [1] reconstructor fix change id: Ie59ad93a67a7f439c9a84cd9cff31540f97f334a
    
    Change-Id: I0c89cf7924a4471bb6d268b5ef3884e2d2cb4286

commit e2f69138bf5fcdd84ac23be6b0bec1bb006b41f5
Author: Clay Gerrard <email address hidden>
Date:   Thu Jul 23 16:46:48 2015 -0700

    Fix string formatting in dispersion cli command
    
     ... and add a basic test that would have prevented the regression
    
    Change-Id: I4c5f643ee291dcc1397ca951450459d8b8ad0bbd

commit 83025ff38dfea3d4e3f27dc045128a7aa4ba11e4
Author: Clay Gerrard <email address hidden>
Date:   Fri Jul 24 11:09:10 2015 -0700

    Use right most occurrence object dir in diskfile.extract_policy
    
      I like using the rightmost one more; it's basically
      /operator-defined/mountpoint/objects/part/suffix/hash/ts.data, so I
      don't see any opportunity for other things named "objects" to creep in on the
      right of the real objects-N dir; but I could see some admin using
      /srv/object-storage/ or something
    
        -- Torgomatic The Wise
    
    Change-Id: I0a63a3e02df091a5ee2e110a345183012e357a2f

commit 363a256e58ee0f3e9f059352c2de968e3dc398e3
Author: Falk Reimann <email address hidden>
Date:   Wed Jun 24 16:54:02 2015 +0200

    Support keystone v3 domains in swift-dispersion
    
    This provides the capability to specify a project_name,
    project_domain_name and user_domain_name in /etc/swift/dispersion.conf.
    If this values are set in dispersion.conf they get populated to the
    swift-client.  With this it is possible to have a specific dispersion
    project specified, which is not the keystone default domain.  Changes
    were applied to swift-dispersion-populate and swift-dispersion-report.
    Relevant man pages, the example dispersion.conf and the admin guide were
    updated accordingly.
    
    DocImpact
    Closes-Bug: #1468374
    
    Change-Id: I0e716f8d281b4d0f510bc568bcee4a13fc480ff7

commit 3d9b2d077a157279fb6cd107a0c83727106af3ef
Author: Daisuke Morita <email address hidden>
Date:   Fri Jul 24 10:42:10 2015 +0900

    Fix swift-object-info to show policy index at deep working directory
    
    If swift-object-info command is executed at deeper working directory
    than 'objects-*' directory, it cannot parse policy index from file path
    so it does not show appropriate policy index. This patch fixes this
    problem by simply extracting the full path of a target object file.
    
    Change-Id: Idb734106a44b6121119c9b1dc8cdaaf4c6c28c31
    Closes-Bug: 1469951

commit e24d7c36fa9758618ef88ed1a8e19f4d7bb0404f
Author: Victor Stinner <email address hidden>
Date:   Mon May 25 18:26:38 2015 +0200

    Use six to fix imports on Python 3
    
    Get configparser, queue, http_client modules from six.moves.
    
    Patch generated by the six_moves operation of the sixer tool:
    https://pypi.python.org/pypi/sixer
    
    Change-Id: I666241ab50101b8cc6f992dd80134ce27327bd7d

commit 964869accce8836bd2587c4b07559fb05fe580b2
Author: Atsushi SAKAI <email address hidden>
Date:   Fri Jul 24 17:09:48 2015 +0900

    Fix six typos on swift documentation
    
    mechanisim => mechanism
        http://docs.openstack.org/developer/swift/cors.html
    overridde => override
       http://docs.openstack.org/developer/swift/deployment_guide.html
    extentsions => extensions
      http://docs.openstack.org/developer/swift/development_ondisk_backends.html
    reuqest => request
      http://docs.openstack.org/developer/swift/logs.html
    suport => support
      http://docs.openstack.org/developer/swift/overview_architecture.html
    mininum => minimum
      http://docs.openstack.org/developer/swift/overview_erasure_code.html
    
    $ git diff | diffstat
     cors.rst | 2 +-
     deployment_guide.rst | 2 +-
     development_ondisk_backends.rst | 2 +-
     logs.rst | 2 +-
     overview_architecture.rst | 2 +-
     overview_erasure_code.rst | 2 +-
     6 files changed, 6 insertions(+), 6 deletions(-)
    
    Change-Id: I8e095f4c216b2cfae48dff1e17d387048349f73c
    Closes-Bug: #1477877

commit f563a423bf2534268c2e785094d58dbbe0ebd390
Author: Hamdi Roumani <email address hidden>
Date:   Wed Jul 22 15:27:26 2015 -0400

    Updated tox setup instructions on Development Guidelines
    
    The instructions suggest updating the ownership of the swift.egg-info
    directory may be required and provide a cmd to do so.  Said cmd assumes user
    'swift' exists, but tox will require the current user to have access to the
    directory to perform updates, moreover user swift may not exist at all.
    
    Change-Id: I63951970553c086ff4f1ac65a81559ba69166494

commit 39621b8629c7f378fc197f6ab1ddc8e2e797d1fa
Author: janonymous <email address hidden>
Date:   Sat Jul 18 14:12:58 2015 +0530

    Deprecated xreadlines() usage fixed
    
    Change-Id: Iadf42c2f86f78c11259e21c88b4aef51db3441ad

commit dde34c4b442a27761f2e6eca46ed9ec47a110392
Author: janonymous <email address hidden>
Date:   Sat Jul 11 22:46:41 2015 +0530

    Modify zip usage for python3 where necessary.
    
    py2 zip() is eager but py3 zip() and six.moves.zip() are lazy,
    changing ones that require eager evaluation.
    
    Change-Id: Ic9f6bccd7f57772158581905794f8d23b05f4223

commit c366ecf5c85c2797582bf79f7faab1d75b99a70e
Author: janonymous <email address hidden>
Date:   Mon Jul 13 00:07:13 2015 +0530

    Fix a minor python issue related with string.split
    
    Replacing string.split(value, ',') with value.split(','):
    the string.split() function was removed in Python 3
    
    Change-Id: I9ed241a894ac698da33df75a774a56ae2824fadf

commit 39b6ef6e4fd515d81e688ef365d26d5e0499be7c
Author: Charles Hsu <email address hidden>
Date:   Thu Jun 25 02:06:54 2015 +0800

    Fix reconstructor stats mssage.
    
    Calculate reconstruction job count and remaining time that
    would be inappropriate for user. Use real partition count would
    be suitable for user.
    
    Change-Id: I6b025854baf4757dddf9d7fe7bc2cece58a49157
    Closes-Bug: #1468298

commit bfbda38db999ccd881509c68f0319c3d3dae4274
Author: Clay Gerrard <email address hidden>
Date:   Tue Jul 7 15:13:20 2015 -0700

    Add save command to ring-builder-analyzer
    
     * cleanup command => ring builder function mapping
     * cleanup ParseCommandError/ValueError message building
    
    Change-Id: I4be2aa963ce4f43035f02371d8388abd7a76536c

commit c907107fe4eacb378a92799de915234bd72d5d7c
Author: janonymous <email address hidden>
Date:   Tue Jul 7 22:46:37 2015 +0530

    cPickle is deprecated in py3, replacing it from six.moves
    
    cPickle is deprecated and should be replaced with six.moves
    to provide py2 and py3 compatibility.
    
    Change-Id: Ibad990708722360d188c641e61444d50a16a1e93

commit 86033ba4dcd7b86670306b6e66345ae464caca9d
Author: Alistair Coles <email address hidden>
Date:   Tue Jun 30 18:56:23 2015 +0100

    EC tests should use ECDiskFileManager
    
    Some EC tests in proxy/test_server.py use the replication
    DiskFileManager to open diskfiles. That works because it
    turns out that DiskFileManager is robust to the frag index
    being stitched onto the end of the timestamp in filenames,
    but it would be better to test using the ECDiskFileManager
    for EC diskfiles.
    
    Also, drive-by deletion of some duplicated lines.
    
    Change-Id: Ie3adb607d8c34a469df7d0f6f542ed5ba9a2dac0