Reviewed:  https://review.openstack.org/541233
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=e473955900dde31dc170bf485e718fdf65955650
Submitter: Zuul
Branch:    feature/deep

commit d9eec63a588e1e1e574b71d67b5d7456c3ad468d
Author: James E. Blair <email address hidden>
Date:   Wed Jan 24 17:05:13 2018 -0800

    Zuul: Remove project name
    
    Zuul no longer requires the project-name for in-repo configuration.
    Omitting it makes forking or renaming projects easier.
    
    Change-Id: I2226881d18e69bf25ad93ee8b8db67248e14f697

commit f4cfe81e593b52e11e67916073a050cd2dde2e00
Author: John Dickinson <email address hidden>
Date:   Tue Jan 16 14:51:29 2018 -0800

    authors/changelog updates for 2.17.0 release
    
    Change-Id: I577d169022916676a20a9ac24c7cc7b63ae46778

commit 8140b7e7ad8eaef0ca110c0f5e185a046b69fd6f
Author: Kazuhiro MIYAHARA <email address hidden>
Date:   Thu Feb 1 09:43:46 2018 +0000

    Fix inconsistency of account info in expirer's unit tests
    
    In expirer's unit tests, FakeInternalClient instances simulates
    expirer's task queue behavior. But get_account_info method of
    the FakeInternalClient returns container count = 1 and object
    count = 2, even if it simulate different count of containers or
    objects.
    
    This patch fixes the behavior. The return values of get_account_info
    will be equal to simulated container and object counts.
    
    This patch will make review for expirer's task queue upgrade patch [1]
    more easy.
    
    [1]: https://review.openstack.org/#/c/517389
    
    Change-Id: Id5339ea7e10e4577ff22daeb91ec90f08704c98d

commit 924a043c70ba38c5d81758b5e0c29fa73674404a
Author: Samuel Merritt <email address hidden>
Date:   Wed Jan 31 16:40:21 2018 -0800

    Remove some cruft from ratelimit tests
    
    The tests were carefully setting up a mock for the 'http_connect'
    function in the ratelimit module, but there is no such function
    imported by the ratelimit module.
    
    As far as I can tell, this has been the case since the ratelimit
    middleware first appeared in 72d40bd (Mon Oct 4 14:11:48 2010 -0700).
    
    Change-Id: If047184c6435aa1647050f50b499dc9feff4318d

commit 5cac37284e1d3f3019309ca86f73e3dbb176df59
Author: Kazuhiro MIYAHARA <email address hidden>
Date:   Thu Jan 25 10:49:00 2018 +0000

    Refactor expirer unit tests
    
    In expirer's unit tests, fake InternalClient classes are defined
    and its instance simulates expirer's task queue behaviors.
    
    To make review for expirer's task queue update patch [1] easy,
    this patch refactors the implementation of the fake InternalClient
    classes. In this patch, unit tests are refactored by the following
    two approaches:
        #1: Summarizing duplicated fake InternalClient implementation
        #2: Make task account name variable
    The #2 approach is for multiple task accounts in [1].
    
    The patch [1] will be rebased after this patch merged.
    
    [1]: https://review.openstack.org/#/c/517389
    
    Change-Id: I10a7151cfdd43460ad38c47f672d3c31b77e7990

commit 1c306660a53447bb0a696873bd3f88e66e3781eb
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed Jan 31 08:18:59 2018 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://docs.openstack.org/i18n/latest/reviewing-translation-import.html
    
    Change-Id: I6e420ea5241838192571dd9d857cca4056699314

commit 5a4d3bdfc49d61ee6e333c8eb1dad4383ae9308b
Author: Tim Burke <email address hidden>
Date:   Tue Dec 5 20:19:37 2017 +0000

    tempurl: Make the digest algorithm configurable
    
    ... and add support for SHA-256 and SHA-512 by default. This allows us
    to start moving toward replacing SHA-1-based signatures. We've known
    this would eventually be necessary for a while [1], and earlier this
    year we've seen SHA-1 collisions [2].
    
    Additionally, allow signatures to be base64-encoded, provided they start
    with a digest name followed by a colon. Trailing padding is optional for
    base64-encoded signatures, and both normal and "url-safe" modes are
    supported. For example, all of the following SHA-1 signatures are
    equivalent:
    
       da39a3ee5e6b4b0d3255bfef95601890afd80709
       sha1:2jmj7l5rSw0yVb/vlWAYkK/YBwk=
       sha1:2jmj7l5rSw0yVb/vlWAYkK/YBwk
       sha1:2jmj7l5rSw0yVb_vlWAYkK_YBwk=
       sha1:2jmj7l5rSw0yVb_vlWAYkK_YBwk
    
    (Note that "normal" base64 encodings will require that you url encode
    all "+" characters as "%2B" so they aren't misinterpretted as spaces.)
    
    This was done for two reasons:
    
       1. A hex-encoded SHA-512 is rather lengthy at 128 characters -- 88
          isn't *that* much better, but it's something.
       2. This will allow us to more-easily add support for different
          digests with the same bit length in the future.
    
    Base64-encoding is required for SHA-512 signatures; hex-encoding is
    supported for SHA-256 signatures so we aren't needlessly breaking from
    what Rackspace is doing.
    
    [1] https://www.schneier.com/blog/archives/2012/10/when_will_we_se.html
    [2] https://security.googleblog.com/2017/02/announcing-first-sha1-collision.html
    
    Change-Id: Ia9dd1a91cc3c9c946f5f029cdefc9e66bcf01046
    Related-Bug: #1733634

commit 11bf9e45884aa5122e76a97cf62062d7b0bdfe54
Author: Joel Wright <email address hidden>
Date:   Sun Sep 4 23:51:53 2016 +0100

    Add support for data segments to SLO and SegmentedIterable
    
    This patch updates the SLO middleware and SegmentedIterable to add
    support for user-specified inlined-data segments. Such segments will
    contain base64-encoded data to be added before/after an object-backed
    segment within an SLO. To accommodate the potential extra data we
    increase the default SLO maximum manifest size from 2MiB to 8MiB.
    The default maximum number of segments remains 1000, but this will
    only be enforced for object-backed segments.
    
    This patch is a prerequisite for a future patch enabling the
    download of large objects as tarballs. The TLO patch will be added
    as a dependent patch later.
    
    UpgradeImpact
    =============
    During a rolling upgrade, an updated proxy may write a manifest that
    out-of-date proxies will not be able to read. This will resolve itself
    once the upgrade completes on all nodes.
    
    Change-Id: Ib8dc216a84d370e6da7d6b819af79582b671d699

commit 89a5c9d56fda8282292253d2d056121694ef7654
Author: Tim Burke <email address hidden>
Date:   Tue Sep 12 22:46:14 2017 +0000

    Disallow fractional replicas in EC policies
    
    Change-Id: I873d7bf7de54e4b1dccdafc8a61f03c09a65dfbc
    Closes-Bug: 1554391
    Closes-Bug: 1677547

commit 10542d00ea131250a184803a03ce2928fadf274e
Author: gaofei <email address hidden>
Date:   Tue Jan 23 16:57:55 2018 +0800

    Replace Chinese punctuation with English punctuation
    
    Curly quotes(Chinese punctuation) usually input from Chinese input method.
    When read from english context, it makes some confusion.
    
    Change-Id: Ibd50299ee287c56ec4759ea8ff53d47d006144f8

commit fdf817b3188459bed60bf8668fac7ee147de2a9e
Author: Tim Burke <email address hidden>
Date:   Tue Jan 23 18:42:40 2018 +0000

    Include policy in ran-out-of-handoffs log message
    
    Related-Change: I2f5bb12f3704880df1750229425f64f419ff9aef
    Change-Id: I14b70e949a57d2c31b71d3efa6ee1200d0717db6

commit 05b2a14fe04d097bfc2155a325fa240983311e97
Author: gaofei <email address hidden>
Date:   Tue Jan 23 14:57:18 2018 +0800

    Update broken link
    
    Change-Id: I8d13696970593d47d0f07cf97aa1284eed5f7a15

commit cbcbc774681ad1a90f8fd260787c29943bedb675
Author: Clay Gerrard <email address hidden>
Date:   Thu Jan 18 18:33:08 2018 -0800

    Internal Client should only retry server errors
    
    Change-Id: I0a3f4a01d50b6a5d5528f527faa34573c7dde619

commit f4cff9fbba76932a4b67f1130d630098497bb4bc
Author: Tim Burke <email address hidden>
Date:   Wed Jan 17 22:07:26 2018 +0000

    object-server can 409 in response to x-if-delete-at
    
    Previously, if the expirer had a stale work item (because the object
    was overwritten or deleted, or some other process handled the delete),
    then it would keep retrying for reclaim_age, but every time it'd get
    back a 412.
    
    Now, have the object-server be smart enough to say, "I have more recent
    information than you" and let the expirer accept that as success.
    
    Change-Id: I0a94482ed16cb30ce79074e053e6177fe97bcaa9

commit 0c27fd2311d512629825eba39868ffc107d2971d
Author: Clay Gerrard <email address hidden>
Date:   Wed Jan 17 13:56:13 2018 -0800

    Reset state every iteration to avoid stale reference
    
    If you get a valid but unexpected response status you have to continue
    the loop.  If you don't reset resp = None some kinds of exceptions might
    get re-raised as with the wrong error.
    
    Change-Id: I5751dfbc176155bea63103a64fd8d4db62323e60

commit 5347c3069dcd28b9e39b9444731836ae29d481ad
Author: Tim Burke <email address hidden>
Date:   Wed Jan 17 20:39:22 2018 +0000

    Add container-reconciler to source doc tree
    
    Change-Id: I98e7e55839e5697d975af0a4756fd09933af1c5f

commit 39efb51d0764cccdbf6a8d2029e96584b97fe636
Author: zhang.lei <zhang.lei@99cloud.net>
Date:   Mon Jan 15 03:20:07 2018 +0000

    Remove the deprecated "giturl" option
    
    From openstackdocstheme 1.18.0, valid Git URLs can be retrieved by
    openstackdocstheme[1], we do not need giturl option anymore.
    
    [1] https://review.openstack.org/532163
    
    Change-Id: I579cebae6486d250915f936f0c1c61008471c089

commit b451ceed4bc9cdbfa591e36cde6c43579839c5ec
Author: Tim Burke <email address hidden>
Date:   Tue Jan 9 23:53:56 2018 +0000

    Add pipeline modification test for previously-recommended pipelines
    
    This includes every pipeline from etc/proxy-server.conf-sample since we
    switched from swauth to tempauth in 1.4.1. As much as anything, I view
    this as a canary for auto-insertion changes, so we can (somewhat easily)
    see where new middlewares will be placed when upgrading from old swifts.
    
    Change-Id: I117937ab6ce28f3bc219e809f07b563c45fc486f
    Related-Change: I88678fddc7a25b0f065b33eb26047321d0db4d38

commit cd11289ba18a916b05dba30956631d9631fb130f
Author: Tim Burke <email address hidden>
Date:   Mon Dec 18 17:14:36 2017 -0800

    Add a small sleep when trying to predict X-Timestamp
    
    The existing test works fine if you're running the tests on an
    all-in-one, but is pretty brittle if you aren't running them on the
    one and only proxy-server they're hitting.
    
    Add 0.1s sleep to allow *some* clock slippage between client and server.
    
    Change-Id: Iacd08e9f703d08d0092b5e8eb53fe287ba1d1596

commit fba3fb70894246124fcb5233f15f1d9cae807756
Author: Tim Burke <email address hidden>
Date:   Mon Dec 18 19:08:58 2017 +0000

    Stop logging tracebacks when the replicator runs out of handoffs
    
    Otherwise, swift-in-the-small can fill up logs with
    
        object-replicator: Error syncing partition:
        Traceback (most recent call last):
          File ".../swift/obj/replicator.py", line 419, in update
            node = next(nodes)
        StopIteration
    
    ...which simultaneously sounds worse than it is and isn't helpful in
    diagnosing/debugging the issue.
    
    Change-Id: I2f5bb12f3704880df1750229425f64f419ff9aef

commit 5b26516ab23288295aeff3764ae0584777547f4d
Author: Tim Burke <email address hidden>
Date:   Wed May 17 18:26:25 2017 -0700

    Increase name-length limits for internal accounts
    
    Double account and container name-length limits for accounts starting with
    auto_create_account_prefix (default: '.') -- these are used internally by
    Swift, and may need to have some prefix followed by a user-settable value.
    
    Related-Change: Ice703dc6d98108ad251c43f824426d026e1f1d97
    Change-Id: Ie1ce5ea49b06ab3002c0bd0fad7cea16cea2598e

commit 88c9ba4396a4e66eb854509a91e94935459444cf
Author: Tim Burke <email address hidden>
Date:   Tue Oct 10 00:27:13 2017 +0000

    Fix bulk heartbeating when emitting XML
    
    Previously, we would set eventlet.minimum_write_chunk_size *after* we
    emit the XML declaration. As a result, eventlet thinks it should buffer
    the entire response, rendering our attempts at heartbeating useless.
    
    Change-Id: Idb58c6cc982cc221fed5fc837afd06aa958d9ad4