Reviewed:  https://review.openstack.org/304251
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=248b9c6679911261efec5a05c92e9c97216080ee
Submitter: Jenkins
Branch:    feature/crypto

commit 33f06dc48f7bec2e128b44427fb429ad640cd486
Author: Ondřej Nový <email address hidden>
Date:   Sat Apr 9 18:47:58 2016 +0200

    Fixed Sphinx errors
    
    doc/source/deployment_guide.rst:1372: ERROR: Malformed table.
    swift/obj/diskfile.py:docstring of swift.obj.diskfile.BaseDiskFileManager.yield_hashes:13: ERROR: Unexpected indentation.
    doc/source/ops_runbook/diagnose.rst:188: WARNING: Inline emphasis start-string without end-string.
    
    Change-Id: Id20eb62eb5baebb3814e7af5676badb94f17dee5

commit a057c409ec8a23290bc72c4fa45d55a1178f4828
Author: OpenStack Proposal Bot <email address hidden>
Date:   Fri Apr 8 07:02:33 2016 +0000

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

commit d09ef0da62b64067b04a980c643f77526a9078ac
Author: Alistair Coles <email address hidden>
Date:   Wed Apr 6 15:40:42 2016 +0100

    Assert that ChunkWriteTimouts are not raised
    
    Follow up for change Ibbc89449e7878fc4215e47e3f7dfe4ae58a2d638
    to add a test assertion that the ChunkWriteTimeout contexts are
    exited without raising the timeout exception in
    iter_bytes_from_response_part().
    
    Change-Id: I6d323cb26779e457fb5940093a81b349b333a0af

commit 7c0f58ec2ed020186ca3f269153b184fc02bf37a
Author: OpenStack Proposal Bot <email address hidden>
Date:   Thu Apr 7 07:00:08 2016 +0000

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

commit edc413b85ec2b703d7506be9c4801eb347611c58
Author: Nguyen Hung Phuong <email address hidden>
Date:   Thu Apr 7 13:31:26 2016 +0700

    Fix typos in Swift files
    
    Change-Id: I39dbf55c094c42347b57ef67520abff9e6fc24bc

commit 95efd3f9035ec4141e1b182516f040a59a3e5aa6
Author: Samuel Merritt <email address hidden>
Date:   Wed Mar 23 13:51:47 2016 -0700

    Fix infinite recursion during logging when syslog is down
    
    Change-Id: Ia9ecffc88ce43616977e141498e5ee404f2c29c4

commit 0bf518e3b0eeaf66653db6972525701cacfe6333
Author: Thiago da Silva <email address hidden>
Date:   Wed Apr 6 16:58:36 2016 -0400

    remove unused current_status method
    
    Change-Id: I574919eaa14cadc800f3a1f6014221ee382ee7e0
    Signed-off-by: Thiago da Silva <email address hidden>

commit e15bceaa7e541c77f26a1f11ee2cbddbc871cbf1
Author: Kota Tsuyuzaki <email address hidden>
Date:   Mon Dec 21 03:13:50 2015 -0800

    Refactor CORS unit tests
    
    This is a follow-up patch for https://review.openstack.org/#/c/258392/
    That one added good unit test cases for various kinds of
    allowe_origin like '*' or ''(empty). However, the result of handling
    in Swift proxy will depend on strict_cors_mode option configuration.
    
    This patch refactors the unit tests to split out for
    strict_cors_mode = on/off and add some missing unit tests for
    each case.
    
    Change-Id: I55f7cd279436b5c9f71d81fecf06021380e35579

commit a460e5affe7089437867afa1ed49ea677c5f4e34
Author: Thiago da Silva <email address hidden>
Date:   Mon Apr 4 16:27:14 2016 -0400

    added javaswift to associated projects
    
    Change-Id: I139ac3acb1c7d2498e87df554b81824ada2dbd00
    Signed-off-by: Thiago da Silva <email address hidden>

commit 4e412e0cd877be0da2b2716a301d1ae2b4c29a13
Author: Cheng Li <email address hidden>
Date:   Sun Apr 3 21:07:00 2016 +0800

    Fix strings with positional arguments
    
    As descriped in develop guideline,
    Any message with more than one variable should use
    named interpolation instead of positional
    http://docs.openstack.org/developer/oslo.i18n/guidelines.html#adding-variables-to-translated-messages
    
    Change-Id: Ia25517cfb52037cf49d0a6ebf528344267fb22cd
    Closes-bug:#1559431

commit ee6af69af429e1a278581531e509be92774f668d
Author: KATO Tomoyuki <email address hidden>
Date:   Fri Apr 1 23:37:25 2016 +0900

    [docs] Update Administrator Guide URL
    
    Change-Id: I7f6f4ffb7033d2a321362c91e05f1576847939b0

commit ebf0b220127b14bec7c05f1bc0286728f27f39d1
Author: Tim Burke <email address hidden>
Date:   Wed Mar 30 14:19:00 2016 -0700

    Fix upgrade bug in versioned_writes
    
    Previously, versioned_writes assumed that all container servers would
    always have the latest Swift code, allowing them to return reversed
    listings. This could cause the wrong version of a file to be restored
    during rolling upgrades.
    
    Now, versioned_writes will check that the listing returned is actually
    reversed. If it isn't, we will revert to getting the full (in-order)
    listing of versions and reversing it on the proxy.
    
    Change-Id: Ib53574ff71961592426cb386ef00a75eb5824def
    Closes-Bug: 1562083

commit 7402d7d9cf91ed00a9c86fc1511592ac2eed5d6c
Author: Clay Gerrard <email address hidden>
Date:   Thu Mar 24 16:42:21 2016 -0700

    Shutdown backend EC connection contexts on disconnect
    
    When eventlet.wsgi closes an ECAppIter on client disconnect we need to
    make sure our sub-iterators are also closed.  We already kill the
    backend sockets, but the executing contexts are left running until
    they timeout.  A slow client can result in needlessly holding queued
    backend fragments until the client_timeout (default 60s).
    
    Update associated test that exposed the problem to demonstrate the
    issue more quickly.
    
    Change-Id: Ibbc89449e7878fc4215e47e3f7dfe4ae58a2d638

commit fa0c5f244f907ed2d5bd6d90f0be44869d7d1de6
Author: Clay Gerrard <email address hidden>
Date:   Mon Feb 29 13:14:59 2016 +0000

    Additionally break container servers during fast-post probes
    
    The existing probetests were already doing brainsplitting on the object
    servers in order to introduce composite metdata timestamp reconciliation.
    
    But they were not introducing failures at the container server level, and
    therefore not covering functional testing of those servers replication
    consistency repair.
    
    This change adds a brain splitter for the container servers to additionally
    exercise the consistency engine at that layer under the existing probetest so
    that you can observe their correct behavior while exercising the probetests
    [1].
    
    1. I used a script like this to watch the object servers and container db's
    repair themselves -> https://gist.github.com/clayg/a8077d9d29ff68bb0edd
    
    Change-Id: Ic5bb03dffef7e30c58338cef969a105577b84620

commit 432e280aef1ba08bbb8dc239260604024325c9f6
Author: Timur Alperovich <email address hidden>
Date:   Wed Jul 15 14:22:45 2015 -0700

    Correctly handle keys starting with the delimiter.
    
    When processing keys where the names start with the delimiter
    character, swift should list only the delimiter character. To get the
    list of nested keys, the caller should also supply the prefix which is
    equal to the delimiter.
    
    Added a functional test and unit tests to verify this behavior.
    
    Fixes Bug: 1475018
    
    Change-Id: I27701a31bfa22842c272b7781738e8c546b82cbc