Reviewed:  https://review.openstack.org/67307
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=6c9f81b97ededf2b6401861f7d876851ff07b34b
Submitter: Jenkins
Branch:    master

commit 6c9f81b97ededf2b6401861f7d876851ff07b34b
Author: Eric Harney <email address hidden>
Date:   Thu Jan 16 13:45:05 2014 -0500

    Sync RPC module from Oslo
    
    22e971a safe_log Sanitize Passwords in List of Dicts
    8b2b0b7 Use hacking import_exceptions for gettextutils._
    23f6029 Use six.seraise() instead of `raise exc, val, tb`
    6d0a6c3 Correct invalid docstrings
    7cac1ac Fix mis-spellings
    ef406a2* Create a shared queue for QPID topic consumers
    e6494c2 Use six.iteritems to make dict work on Python2/3
    e227c0e* Properly reconnect subscribing clients when QPID broker restarts
    16fb43b Replace data structures' attribute with six module
    27b21bc Unify different names between Python2/3 with six.moves
    12bcdb7 Remove vim header
    3970d46 Fix typos in oslo
    1771a77 Adjust import order according to PEP8 imports rule
    0717d1d matchmaker_redis compatibility with redis-py 2.4
    f88d59a Drop RPC securemessage.py
    39f6589 Use localisation
    8a3996a Fix missing space in help text
    4bfb7a2 Apply six for metaclass
    d7d74a7 Add `versionutils` for version compatibility checks
    3cdd157 Add third element to RPC versions for backports
    76972e2* Support a new qpid topology
    284b13a Raise timeout in fake RPC if no consumers found
    9721129 exception: remove
    7b0cb37 Don't eat callback exceptions
    69abf38 requeue instead of reject
    28395d9 Fixes files with wrong bitmode
    bec54ac Fix case error in qpid exchange type "direct"
    61c4cde Ensure context type is handled when using to_dict
    223f9e1 Clarify precedence of secret_key_file
    a035f95 Don't shadow cfg import in securemessage
    0f88575 Remove redundant global keyword in securemessage
    848c4d5 Some nitpicky securemessage cleanups
    5c71c25 Allow non-use of cfg.CONF in securemessage
    9157286 RPC: Add MessageSecurity implementation
    2031e60 Refactors boolean returns
    a047a35 Make ZeroMQ based RPC consumer threads more robust
    34a6842 On reconnecting a FanoutConsumer, don't grow the topic name
    f52446c Add serializer param to RPC service
    5ff534d Add config for amqp durable/auto_delete queues
    f9f1b4f Revert "Add support for heartbeating in the kombu RPC driver"
    1a2df89 Enable H302 hacking check
    7bfd443 Avoid shadowing Exception 'message' attribute
    99b7c35 Convert kombu SSL version string into integer
    c37f6aa Add support for heartbeating in the kombu RPC driver
    3006787 Sanitize passwords in _safe_log
    dea334a Replace sys.exit by a RPCException
    3969355 Fix exception arg typo
    22ec8ff Make AMQP based RPC consumer threads more robust
    13650b1 rpc: remove some unused serialization code
    e204885 Optionally reject messages on exception.
    688832f Remove unused zmq relay functionality
    719eba4 Don't reconnect to exclusive fanout consumers.
    980fe5f Allow exceptions to hop up cells
    80476f0 Add can_send_version() to RpcProxy.
    7119e29 Enable hacking H404 test.
    32e2a25 zmq: remove someone unused code from ZmqClient
    6d42ced Remove the amqp_rpc_single_reply_queue option from Havana
    7ce5441 Fix problem with long messages in Qpid
    e3545f8 Enable hacking H402 test
    15d8d69 Silence exceptions from qpid connection.close()
    484a1df Enable hacking H403 test
    35660da Enable hacking H401 test
    1a9a744 MatchMakerStub - make it work & add test
    35aad91 Use zero-copy in ZeroMQ proxy (zmq-rpc-receiver)
    b677b13 Remove rootwrap from IPC directory creation
    93ee6e3 Add generic serialization support
    fe2f108 Enable hacking H702 localization test
    0a14e1d Enable hacking H703: Multiple positional placeholders
    df7ea83 Allow RPC_API_NAMESPACE on RpcProxy objects
    aa89d8b Support capping message versions in the client.
    1d7920a Extract matchmaker_ring to own module
    3e33692 Merge "Removes len() on empty sequence evaluation"
    44c79fc Merge "python3: use 'as' syntax for exception assignment"
    0c54b72 python3: use 'as' syntax for exception assignment
    a514693 Removes len() on empty sequence evaluation
    fde1e15 Convert unicode for python3 portability
    0c9047c* Ensure that qpid connection is closed.
    120ddef Improve Python 3.x compatibility
    
    (* after hash indicates this was already ported to Cinder)
    
    Oslo version:
    7a51572 Merge "Implement cache abstraction layer"
    Date:   Wed Jan 15 19:31:16 2014 +0000
    
    Related-Bug: #1189711
    Closes-Bug: #1270178
    
    Change-Id: I19572c5e98c1c1037a6a622d63fbdea8d6001532