Reviewed:  https://review.opendev.org/663260
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=3ba65cb7eca6948d32b53ba91157037c48f06002
Submitter: Zuul
Branch:    feature/losf

commit 79ab3a490ada6aa4db28efa5b71a3f1a080920f7
Author: Clay Gerrard <email address hidden>
Date:   Tue Jun 4 11:45:35 2019 -0500

    Note s3api compatability requirements in sample.conf
    
    Change-Id: I12f6e4a5a880a2d5e0f4fff4618e4196be311267

commit eaf180c68dc7cba866df0c70199ae48fb382c6e0
Author: Pete Zaitcev <email address hidden>
Date:   Mon Jun 3 22:00:41 2019 -0500

    Fix a few Sphinx warnings
    
    This precludes us from landing anything in the gate, because we
    treat Sphinx warnings as errors in OpenStack.
    
    Specifically, 3 warnings are fixed:
    
    /home/zuul/src/opendev.org/openstack/swift/swift/common/middleware\
    /s3api/etree.py:docstring of\
     swift.common.middleware.s3api.etree.Element:1:\
    Inline strong start-string without end-string.
    
    duplicate object description of\
     swift.common.middleware.versioned_writes, other instance in\
     middleware, use :noindex: for one of them
    
    duplicate object description of\
     swift.common.ring.composite_builder, other instance in\
     overview_ring, use :noindex: for one of them
    
    Change-Id: I5e0bd61a301d46b2674b4605882462575b635220

commit 4f9595f1130f6c45f8e3e08db55dddc31844be93
Author: Matthew Oliver <email address hidden>
Date:   Tue Apr 23 12:15:32 2019 +1000

    py3: port symlink middleware
    
    This patch ports the symlink middleware to py3.
    The middleware itself seems to be mostly fine and most changes
    are in the symlink unit tests.
    
    Change-Id: I973c2e1bb8969cf6bffece8ce68881c393efbaef

commit 2c4f284055e1031f17f97229056616017385d8bc
Author: zengjia <email address hidden>
Date:   Thu May 23 10:53:31 2019 +0800

    Modify the version path URL of the configuration file
    
    In the main branch, I think it is necessary to modify
    the configuration file path in the document as the
    main branch path, and to change the path to a stable
    version when the version is released.
    
    Change-Id: Ib1bc4c59ed4c7624782b8b1cdea20847c14c90bf

commit ff04ef05cd5a8f9675cbc8f292fa666d03ae6644
Author: Tim Burke <email address hidden>
Date:   Wed May 22 16:36:50 2019 -0700

    Rework private-request-method interface
    
    Instead of taking a X-Backend-Allow-Method that *must match* the
    REQUEST_METHOD, take a truish X-Backend-Allow-Private-Methods and
    expand the set of allowed methods. This allows us to also expose
    the full list of available private methods when returning a 405.
    
    Drive-By: make async-delete tests a little more robust:
      * check that end_marker and prefix are preserved on subsequent
        listings
      * check that objects with a leading slash are correctly handled
    
    Change-Id: I5542623f16e0b5a0d728a6706343809e50743f73

commit 04c8015b889e3ddcbf111f3b0fa99bbbe12b8624
Author: Clay Gerrard <email address hidden>
Date:   Wed May 22 16:23:42 2019 -0500

    Add more tests for async expirer
    
    Related-Change-Id: Ia13ee5da3d1b5c536eccaadc7a6fdcd997374443
    Change-Id: Ic70eb61b32b196d356c9a3b40a22807456c7b0f2

commit 40bd9f16a348236a8710b98b66115f659c47354b
Author: Tim Burke <email address hidden>
Date:   Wed May 15 15:29:08 2019 -0700

    py3: port diskfile
    
    Change-Id: Ie73f9df460f9014014168d6e60767e66b24d30b0

commit 8868e2cd5062541f2d9b3d5c2091e4122a830f83
Author: Tim Burke <email address hidden>
Date:   Wed May 15 12:59:57 2019 -0700

    Clean up test_write_read_metadata
    
    I'm pretty sure I botched the intent of the test when I touched it in
    https://github.com/openstack/swift/commit/36c4297
    
    As a side-effect, clean up a warning on py2:
    
        UnicodeWarning: Unicode equal comparison failed to convert
        both arguments to Unicode - interpreting them as being unequal
    
    Change-Id: I4da8264f85e688bc5109016c197378ca6dfe06a5

commit 83d01619910c34f2e3fafeda20bc4f7e7e8f482f
Author: Tim Burke <email address hidden>
Date:   Wed Mar 27 15:28:50 2019 -0700

    Add operator tool to async-delete some or all objects in a container
    
    Adds a tool, swift-container-deleter, that takes an account/container
    and optional prefix, marker, and/or end-marker; spins up an internal
    client; makes listing requests against the container; and pushes the
    found objects into the object-expirer queue with a special
    application/async-deleted content-type.
    
    In order to do this enqueuing efficiently, a new internal-to-the-cluster
    container method is introduced: UPDATE. It takes a JSON list of object
    entries and runs them through merge_items.
    
    The object-expirer is updated to look for work items with this
    content-type and skip the X-If-Deleted-At check that it would normally
    do.
    
    Note that the target-container's listing will continue to show the
    objects until data is actually deleted, bypassing some of the concerns
    raised in the related change about clearing out a container entirely and
    then deleting it.
    
    Change-Id: Ia13ee5da3d1b5c536eccaadc7a6fdcd997374443
    Related-Change: I50e403dee75585fc1ff2bb385d6b2d2f13653cf8

commit 4927b1f29c4d993cb29786312a9efc00850c10cb
Author: Alexandre Lécuyer <email address hidden>
Date:   Thu May 16 18:08:03 2019 +0200

    Specify pickle protocol in REPLICATE()
    
    The default pickle protocol in python3 is version 3. This is not
    readable by a python2 interpreter.
    
    Force the use of version 2 in the object server REPLICATE() function,
    for compatibility with python 2.
    
    Change-Id: I19d23570ff3a084d288de1308e059cfd8134d6ad

commit 61a4567a8de62160afabfd63ba416fa940f9b742
Author: zengjia <email address hidden>
Date:   Wed May 22 14:55:16 2019 +0800

    Controller install Debian missing proxy-server.conf configuration
    
    Missing proxy-server.conf configuration document for installing
    control nodes in Debian
    
    Change-Id: I174ba8841ed638732bcf933602c25aad8e62f0ca

commit 6008b0a83f862b2396ad6642b7863a30a258520b
Author: Alexandre Lécuyer <email address hidden>
Date:   Thu Apr 18 16:35:07 2019 +0200

    Fix quarantine when object path is not a directory
    
    In the diskfile module, there are a couple of cases where we would
    quarantine the suffix dir if a single object within is not a directory.
    
    Change the code so that we quarantine only the object.
    
    Change-Id: I35eb16f568c00d973eb089aedd0e5a5619c25a2f

commit d4e7940457cd31b4ee91a01a0c492781179fcfe4
Author: Timur Alperovich <email address hidden>
Date:   Sat May 4 12:11:54 2019 -0700

    Start transition to boto3 in s3api tests.
    
    Adds the scaffolding required for tests to use boto3 and converts the
    test_bucket.py tests to the new interface. Follow on patches will
    convert the other tests to use the boto3 library.
    
    Notable changes: we no longer try to reach for the equivalent of
    `boto.make_request()` and instead rely on the boto3/botocore event
    system to mutate requests as necessary (or to disable pre-flight
    validators).
    
    Partial-Bug: 1557260
    Change-Id: I3d77ef4a6b878c49ebfa0c8b8647d7199d87601e

commit bd8c3067b40092d53552ff686bdce030b9807fa8
Author: Pete Zaitcev <email address hidden>
Date:   Tue Feb 19 17:36:11 2019 -0600

    py3: slo
    
    This adds wsgi_to_str(self.path_info) everywhere we forgot it,
    not only in the slo module itself.
    
    Dropping the body=''.join(body) after call_slo() is obvious:
    the latter only returns strings of bytes, not lists of such.
    
    Change-Id: I6b4d87e4cda4945bc128dbc9c1edd39e736a59d2

commit ad034023f30f4d00e9c21bf3e095d3c04b4b7609
Author: Tim Burke <email address hidden>
Date:   Fri May 17 10:30:21 2019 -0700

    Be explicit that a code path is just for py2
    
    Change-Id: I7d0345a712f71e76034910fa7bb2bbaf42b4d2ff

commit add5a411ace942663d99f92e443b1effc6e7a867
Author: Tim Burke <email address hidden>
Date:   Wed May 15 15:39:25 2019 -0700

    Make build/upload/promote image jobs non-voting
    
    Change-Id: If284513ead5ff0d7f9e997ebf2a8820c9acf79e3

commit bec2cccd430845aba7437075feb3dbc7099fc5c2
Author: Tim Burke <email address hidden>
Date:   Tue May 14 17:10:54 2019 -0700

    py3: port expirer
    
    Change-Id: Ib5aeda94fe9b165f54ad7412d68d71b62e427a40

commit 8b64381371b542d46fadba428d3b910dcbcd8d93
Author: Timur Alperovich <email address hidden>
Date:   Mon May 13 18:38:24 2019 -0700

    Set Content-Type with s3api metadata updates.
    
    S3 supports two metadata operations on object copy: COPY and REPLACE.
    When using REPLACE, the Content-Type should be set to the one supplied
    by the caller. When using COPY, the existing object's Content-Type value
    is used.
    
    Change-Id: Ic7c6278dedef308c9219eb45751abfa5655f144f
    Closes-Bug: #1828907

commit 5cd2a2ac2f0552247ada19cc02ec0ca5389375bf
Author: Tim Burke <email address hidden>
Date:   Sun May 5 12:38:57 2019 -0700

    py3: bulk -- alternate approach
    
    Related-Change: I3603247e0c36299de2107aa8e494a3f87647696f
    Change-Id: Iaf14c1ab3e236e6774492ed711fccef066a16fca

commit 89c9c6f0b27fcc208996590610df8b04bec2ebc8
Author: Tim Burke <email address hidden>
Date:   Fri May 3 16:38:29 2019 -0700

    Have a separate s3api functional test suite
    
    The idea is that we should have a suite of pure-S3 tests that we can
    point at AWS to verify that we've written accurate tests, then point at
    Swift-with-s3api to verify that we've correctly implemented the S3 api.
    
    As a start, just check GET Service; go ahead and create a few buckets
    so we can see them in the service listing.
    
    Change-Id: I283757cd3084b1c83a1e9bf0f46b6ce9d7ee8eb9

commit 4f4456561fb0443389e30efbe81c51c0e80cb6e6
Author: Tim Burke <email address hidden>
Date:   Fri Mar 22 12:18:51 2019 -0700

    Add py37 func test job
    
    Make a new func-py3 tox env that will use whatever version of py3 is
    available, and set up a new check/gate job that runs it under py37.
    
    Change-Id: I1ef233276697be994494ed858e88ce97634f814e

commit 506279235d12f1590bd928de51d991b7fb425e6e
Author: Tim Burke <email address hidden>
Date:   Fri Mar 1 12:43:42 2019 -0800

    Get functional/tests.py running under py3
    
    Note that you need a pretty recent eventlet to pick up
    https://github.com/eventlet/eventlet/commit/f0bc79e
    
    Change-Id: I6b006b972e7431c406039f4e0f6890a8f74a4432

commit dade632b0fbb10ef9419f2f9bcd063f3f962dbbf
Author: Timur Alperovich <email address hidden>
Date:   Tue May 7 16:15:59 2019 -0700

    S3Api: handle non-ASCII markers in v1 listings.
    
    Added a test for S3 v1 listings that use URL encoding and have non-ASCII
    characters. In the process discovered that the XML schema for
    ListBucketResult had a small problem: Delimiter and EncodingType needed
    to be reordered.
    
    Change-Id: Ib3124ea079a73a577b86de97657603a64b16f965

commit 9290f29e1cd622b5155ebec3600cc4c6e6fb0b31
Author: Tim Burke <email address hidden>
Date:   Mon Apr 15 15:40:15 2019 -0700

    Wait longer for log lines in unit test
    
    We've seen a noteworthy (literally -- there's a comment about it) number
    of failures for test_multiphase_put_drains_extra_commit_junk_disconnect;
    I'd rather waste an extra few hundredths of a second every run than have
    to recheck most patches we want merged.
    
    Co-Authored-By: Clay Gerrard <email address hidden>
    Change-Id: Iebec6c18866e4f8ef40faab539b173f017d658e3

commit 9468e28ccf4e84915c300e4f466ec2e31690495d
Author: Tim Burke <email address hidden>
Date:   Wed Apr 17 21:55:09 2019 -0700

    Make test_read_write_acl_listings more robust
    
    When retrying in func tests, you may get a different status if the
    previous attempt succeeded.
    
    Change-Id: Ie9bf99af1298fae5cd91fb03d5b5f13ff4873b3c