Reviewed:  https://review.openstack.org/158370
Committed: https://git.openstack.org/cgit/openstack/swift/commit/?id=24d3f51386965197c36d506228e34ca1c4100165
Submitter: Jenkins
Branch:    feature/crypto

commit db29ffc98384a9f61c2d4cc48bb2faf9f5dd0478
Author: Samuel Merritt <email address hidden>
Date:   Fri Feb 20 11:04:24 2015 -0800

    Make proxy_logging close the WSGI iterator
    
    PEP 333 says that the WSGI framework will call .close() on the
    iterator returned by a WSGI application once it's done, provided such
    a method exists. So, if our code wraps an iterator, then we have to
    call .close() on it once we're done with it. proxy_logging wasn't.
    
    Since WSGIContext gets it right, I looked at making proxy_logging use
    WSGIContext. However, WSGIContext is all about forcing the first chunk
    out of the iterator so that it can capture the final HTTP status and
    headers; it doesn't help if you want to look at every chunk.
    proxy_logging wants every chunk so it can count the bytes sent.
    
    This didn't hurt anything in Swift, but pconstantine was complaining
    in IRC that our failure to call .close() was goofing up some other
    middleware he had.
    
    Change-Id: Ic6ea0795ccef6cda2b5c6737697ef7d58eac9ab4

commit 4ca08cc395e686265574366497a6869e94eebcb2
Author: Alistair Coles <email address hidden>
Date:   Tue Feb 17 10:27:44 2015 +0000

    Update guest VM OS recommendation in SAIO doc
    
    The target development platform has changed to Ubuntu 14.04 [1].
    This patch makes the suggested SAIO platform the same.
    
    Also, remove pointer to wiki page for other platform install
    instructions that either redirects back to this SAIO doc or
    to another wike page and then a dead link.
    
    [1] I0a96bcf692bb240f3ab5aab7fefd294a07735a83
    
    DocImpact
    
    Change-Id: I9f96104b5437c1f1f28f924c048ef83cf03338f4

commit 7bc09dfdea0893a49e50005b22b426ae21c11d22
Author: Arnaud JOST <email address hidden>
Date:   Wed Feb 18 11:56:11 2015 +0100

    Add support of x-remove- headers for container-sync
    
    If the used tool to send header doesn't support empty headers (older versions
    of curl), x-remove can be used to remove metadata.
    sync-key and sync-to metadata, used by container-sync, can now be removed using
    x-remove headers.
    
    Change-Id: I0edb4d5425a99d20a973aa4fceaf9af6c2ddecc0

commit 949804eda4a85c3c960b0baa090e16f1aa48e95e
Author: John Dickinson <email address hidden>
Date:   Mon Feb 16 14:00:24 2015 -0800

    update the getting started doc
    
    Change-Id: I0a96bcf692bb240f3ab5aab7fefd294a07735a83

commit dd1a05f52765a6273906b5d6ce55f81e269bad12
Author: OpenStack Proposal Bot <email address hidden>
Date:   Mon Feb 16 06:30:54 2015 +0000

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

commit 7acc2911296f48f10165282eee6bfe8e5c817a69
Author: John Dickinson <email address hidden>
Date:   Sun Feb 15 17:14:31 2015 -0800

    added swift_source to ratelimit info calls
    
    Change-Id: I2b4ccb809c0f4505098e261f546f53c27440dd43

commit 023e29fa1e5ea9e22b12c897ea6f944c537c6bf3
Author: Richard Hawkins <email address hidden>
Date:   Thu Feb 12 16:39:48 2015 -0600

    Add functional tests for container TempURLs
    
    Change-Id: I7f54594df1522d72dd1d13556be0b9d33e811b30

commit ca0fce8542645b9f7b934817eb4cab7835ec0d3c
Author: Leah Klearman <email address hidden>
Date:   Fri Feb 13 16:55:45 2015 -0800

    more probe test refactoring
    
    * move get_to_final_state into ProbeTest
    * get rid of kill_servers
    * add replicators manager and updaters manager to ProbeTest
    
    (this is all going someplace, i promise)
    
    Change-Id: I8393a2ebc0d04051cae48cc3c49580f70818dbf2

commit 2655465d82b8b0acb29babf5d7520808860702cc
Author: Clay Gerrard <email address hidden>
Date:   Fri Feb 13 13:11:40 2015 -0800

    Promote some of the best developers I know to CORE Emeritus
    
    Change-Id: I4095bdbb2c137615bf9492e373a837daadea8920

commit 596042b9c778114dcfab1670e1ca40aa3a8c71ee
Author: Clay Gerrard <email address hidden>
Date:   Thu Feb 12 16:15:42 2015 -0800

    Minor cleanup post efficent multi-region replication
    
    One log line had a typo, and I refactored the per object cleanup code out of
    update_deleted into the per object hashdir cleanup method.
    
    Change-Id: I19d03d0706a75bd8ec2fe327a1eb1b5ec36de6d2

commit b8e85a42ec18d234bbbe45d0c94f386610e4cd8a
Author: OpenStack Proposal Bot <email address hidden>
Date:   Fri Feb 13 06:10:44 2015 +0000

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

commit a4ffd1d1c6f8027d408c73076113ddafdc79ebc0
Author: Leah Klearman <email address hidden>
Date:   Thu Feb 12 20:32:35 2015 -0800

    move test comments around
    
    should make later refactoring easier
    
    Change-Id: I7af399a14c8bc78fcfc438e4440d2f023c8aa5db

commit 82e5090848ecf2e5225acf1741e40c670ad3f121
Author: Alistair Coles <email address hidden>
Date:   Thu Feb 12 21:30:37 2015 +0000

    Fix ssync send_delete
    
    The ssync_sender send_delete method treats its
    timestamp argument as a string when in fact it is
    passed a Timestamp object. As a result the method
    always raises an exception and deletes are never
    replicated.
    
    This patch fixes bug and adds unit and probe tests
    to verify expected behavior.
    
    Closes-Bug: 1421425
    
    Change-Id: I664fb8d5dfea7362313037a67927ea90021c3f62

commit a9b5982d525d6b1ed369e780835b5b26a250ad95
Author: Samuel Merritt <email address hidden>
Date:   Thu Feb 12 09:59:48 2015 -0800

    Fix account-reaper
    
    As part of commit efb39a5, the account reaper grew a bind_port
    attribute, but it wasn't being converted to int, so naturally "6002"
    != 6002, and it wouldn't reap anything.
    
    The bind_port was only used for determining the local devices. Rather
    than fix the code to call int(), this commit removes the need for
    bind_port entirely by skipping the port check. If your rings have IPs,
    this is the same behavior as pre-efb39a5, and if your rings have
    hostnames, this still works.
    
    Change-Id: I7bd18e9952f7b9e0d7ce2dce230ee54c5e23709a

commit 2c1b5af06218fa936c8c9fb0180f22db212bf18a
Author: Leah Klearman <email address hidden>
Date:   Thu Feb 12 11:30:21 2015 -0800

    refactor probe tests
    
    * refactor probe tests to use probe.common.ProbeTest
    * move reset_environment functionality to ProbeTest.setUp()
    * choose rings and policies that meet the criteria - raise SkipTest if
    nothing matches
    * replace all AssertionErrors in setup with SkipTest
    
    Change-Id: Id56c497d58083f5fd55f5283cdd346840df039d3

commit f5b533fb2f217a987d9bd7898b6baed31e9a1a31
Author: Richard Hawkins <email address hidden>
Date:   Wed Feb 11 12:44:08 2015 -0600

    Update TempURL docs to include containers
    
    Change-Id: Ifb7c26b23ec81e3bde96b6e3bad0e950c0ca9408

commit f5ab30574ea92c1457a30dccaedc1f1883fab64e
Author: Alistair Coles <email address hidden>
Date:   Wed Feb 11 17:49:41 2015 +0000

    Fix logger test coupling
    
    Two tests fail if test/unit/common/test_daemon.py is excluded
    from the test set:
    
    test.unit.common.test_utils.TestUtils.test_swift_log_formatter
    test.unit.common.test_utils.TestStatsdLoggingDelegation.test_thread_locals
    
    They fail because they assert that logger.txn_id is None,
    when previous tests cause txn_id to be set. This coupling is masked
    when test_daemon.py is included because it reloads the common/utils
    module, and is executed just before test.unit.common.test_utils.
    
    The coupling can be observed by running, for example:
    
    nosetests ./test/unit/common/middleware/test_except.py ./test/unit/common/test_utils.py
    or
    nosetests ./test/unit/proxy ./test/unit/common/test_utils.py
    
    The failing tests should reset logger thread_locals before making
    assertions. test_utils.reset_loggers() attempts this but is broken
    because it sets thread_local on the wrong object.
    
    Changes in this patch:
     - fix reset_loggers() to reset the LogAdapter thread local state
     - add a reset_logger_state decorator to call reset_loggers
       before and after a decorated method
     - use the decorator for increased isolation of tests that previously
       called reset_loggers only on exit
    
    Change-Id: If9aa781a2dd1929a47ef69322ec8c53263d47660

commit ca90be414e0e50fd83c09550c5e999bc93c5c35c
Author: Clay Gerrard <email address hidden>
Date:   Wed Feb 11 16:36:51 2015 -0800

    Add developer tools section to associated projects
    
    vagrant-swift-all-in-one is being used and maintained by a number of swift
    developers, it has an open source license.
    
    The ansible playbook project serves a similar goal but it's based on a Fedora
    distribution and includes Swift-on-File support.
    
    Drive-by fix for the Swift-on-File link which has migrated to stackforge.
    
    Change-Id: Id7478d58adcead57cf56ac4e1d05c6556c8c9b7b

commit f5d509471b36dfe1a008523a3a8e1ec4e5518f02
Author: Daisuke Morita <email address hidden>
Date:   Thu Feb 12 05:12:56 2015 +0900

    Logging a policy index when container PUT request conflicts
    
    This is a continuing work of patch afdbf73. This patch enables
    proxy-server to log a policy index when container PUT request
    conflicts with existing container's policy index.
    
    Change-Id: I6d40044c510632a0f61b817a9af2f6c13a721d39
    Implements: blueprint logging-policy-number

commit 69797efcbba2076eae944754e0a8585122374544
Author: David Goetz <email address hidden>
Date:   Wed Feb 11 11:37:31 2015 -0800

    small bug with account to account copy
    
    Change-Id: I7fdf432666f7640082e9839b9dc3d7af94a0715f

commit 843ce7e301ce06c6dc14e576a46b942bcb640c04
Author: Donagh McCabe <email address hidden>
Date:   Wed Feb 11 10:24:23 2015 +0000

    API document update for container-level tempurl/formpost
    
    Tempurl and Formpost now support secret keys at the container
    level [1]. Adds these headers:
    
        X-Container-Meta-Temp-Url-Key
        X-Container-Meta-Temp-Url-Key-2
    
    DocImpact -- because headers need to be added to [2]
    
    [1] https://review.openstack.org/#/c/154293
    [2] http://developer.openstack.org/api-ref-objectstorage-v1.html
    
    Change-Id: I157cd4a540dcc4a9b45bc3d806df152ab56e2354

commit 489dd5ff5db0590f5232e5c309bf50ba9481f804
Author: Richard Hawkins <email address hidden>
Date:   Mon Feb 9 17:51:01 2015 -0600

    Add support for container TempURL Keys
    
    Change-Id: Ic22b0b84b657e6cac7e0062fa410eefb09bc0f4d
    Co-Authored-By: Christian Schwede <email address hidden>

commit 20ca279d747523f5cb942567515f85d03779eb8a
Author: Kota Tsuyuzaki <email address hidden>
Date:   Thu May 29 00:54:07 2014 -0700

    Efficient Replication for Distributed Regions
    
    This change provides a efficient way of replication
    between regions of a global distributed cluster.
    
    This approach makes object-replicator to push replicas
    to a primary node in a remote region, then, to skip
    pushing them to next primary node in the region with
    expecting asynchronous replication.
    
    This implementation includes a couple of changes on
    ssync_sender to allow object-replicator to delete local
    handoff objects correctly. One is to return a list of existing
    objects in remote region. The list includes local paths of the
    objects which exist both on the local device and the remote device.
    The other is supporting existence check for specified objects.
    It requires the object list build by the first change. When
    the object list is given, ssync_sender does only missing_check
    based on the list. These changes are needed because current
    swift can not handle the existence check in object-level.
    
    Note that this feature will work partially (i.e. only when
    primary-to-primary) with rsync.
    
    Implements: blueprint efficient-replication
    Change-Id: I5d990444d7977f4127bb37f9256212c893438df1

commit 2e5eb7dbed6d35c12d2debeac02ec17f3f4c0783
Author: Christian Schwede <email address hidden>
Date:   Tue Feb 10 18:22:35 2015 +0000

    Fix swift-recon --all help message
    
    There are three options missing in the "--all" option help message. Let's add
    them to make it less error-prone if someone wants to copy-paste the command.
    
    Unfortunately a line break "\n" doesn't work, thus forcing all options into a
    single line using tabs.
    
    Change-Id: I38a7a1d8bb267b00b1d9776228f6c6fe794808d0

commit f96b8e412db73721660aa8247430db76c3149508
Author: Janie Richling <email address hidden>
Date:   Mon Feb 9 18:16:25 2015 -0600

    Included sysmeta in the object info
    
    The cached info object dict did not include
    the sysmeta.  This patch fixes that, and adds
    a unit test.
    
    Change-Id: I092200e76586af322ed4ff7d194a1034b1ca0433

commit a82bfb25ba180dbde700d2f9108acf1c85f5d61f
Author: Alistair Coles <email address hidden>
Date:   Thu Jan 29 14:26:01 2015 +0000

    Make container GET call authorize when account not found
    
    When an account was not found, ContainerController would
    return 404 unconditionally for a container GET or HEAD request,
    without checking that the request was authorized.
    
    This patch modifies the GETorHEAD method to first call any
    callback method registered under 'swift.authorize' in the
    request environ and prefer any response from that over the 404.
    
    Closes-Bug: 1415957
    
    Change-Id: I4f41fd9e445238e14af74b6208885d83698cc08d

commit efb39a5665f9c9f2649aac257d0f617479dea4ce
Author: Hisashi Osanai <email address hidden>
Date:   Tue Dec 9 04:44:52 2014 +0900

    Allow hostnames for nodes in Rings
    
    This change modifies the swift-ring-builder and introduces new format
    of sub-commands (search, list_parts, set_weight, set_info and remove)
    in addition to add sub-command so that hostnames can be used in place
    of an ip-address for the sub-commands.
    The account reaper, container synchronizer, and replicators were also
    updated so that they still have a way to identify a particular device
    as being "local".
    
    Previously this was Change-Id:
    Ie471902413002872fc6755bacd36af3b9c613b74
    
    Change-Id: Ieff583ffb932133e3820744a3f8f9f491686b08d
    Co-Authored-By: Alex Pecoraro <email address hidden>
    Implements: blueprint allow-hostnames-for-nodes-in-rings

commit 8607833fddba074823de58f4f4bd2707bf90fc9c
Author: Daisuke Morita <email address hidden>
Date:   Fri Dec 12 10:37:33 2014 +0900

    Output account-reaper's logs for PolicyError
    
    By some operational mistakes, policy settings can be inconsistent among
    servers of swift cluster. Before this patch, if a policy setting of the
    server where account-reaper daemon is running is different from other
    servers, reap_object process failed without outputing error logs and
    count up remaining objects.
    
    Change-Id: Ic84fef7b49c77f0197f0bec4d41401686114d50e
    Related-Bug: 1375384

commit afdbf73f1285319003fecb0415a691dd9c9e9c98
Author: Daisuke Morita <email address hidden>
Date:   Thu Nov 27 18:42:49 2014 +0900

    Output logs of policy index
    
    To make it easier for Swift operators to specify problematic devices,
    a policy index will be recorded in log files of proxy and storage servers
    for each user request which is related to storage policy.
    
    This patch simply adds 'storage_policy_index' field in a log format.
    If there is no specified policy index, '-' is output in this field.
    
    Extra fix: Doc about the log line of storage nodes now properly reflects
               'server_pid' field.
    
    DocImpact
    
    Change-Id: I7286ae85bcbcec73b5377dc115cbdb0f57d1b025
    Implements: blueprint logging-policy-number

commit f8fa1a9234cd0c1d7466dd51d8528e2abd859c2b
Author: Daisuke Morita <email address hidden>
Date:   Fri Nov 28 20:19:02 2014 +0900

    Show each policy's information on quarantined files in recon
    
    After the release of Swift ver. 2.0.0, some recon responses do not
    show each policy's information yet. To make things worse, some recon
    results only count on policy-0's score, therefore the total is not
    shown in the recon results.
    
    This patch makes the count of quarantined files policy-aware for recon
    requests. Suppose a number of quarantined objects for policy-0 is 2
    and a number for policy-1 is 3, recon sums up every policy's amount
    and shows information for each policy as follows.
    
    $ curl http://<host>:<port>/recon/quarantined
    {"accounts": 0, "containers": 0, "objects": 5, "policies": {"0":
    {"objects": 2}, "1": {"objects": 3}}}
    
    Moreover, this patch adds stats for each policy in CLI output.
    
    Change-Id: I07217c635f6fc4ea809ddbc3d859c4e81c4fde37
    Related-Bug: 1375327
    Related-Bug: 1375332