Reviewed:  https://review.openstack.org/235282
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=0f7d289a2899082802499a498cba34a3abca321d
Submitter: Jenkins
Branch:    master

commit 61026d4e4f2a58dd84ffb2e4e40ab99860b9316a
Author: Davanum Srinivas <email address hidden>
Date:   Tue Oct 6 18:45:12 2015 -0700

    Squashed commit of WebOb 1.5 and oslo.db fixes
    
    Add testresources and testscenarios used by oslo.db fixture
    
    If we use oslo.db fixtures, we'll need these 2 packages or
    the next version of oslo.db release will break us.
    
    Closes-Bug: #1503501
    Change-Id: I8facdaf69c79b1b1ae4f9f64e9856e12f14440ed
    (cherry picked from commit ec40c3b6ddbfa4912ca6e612558efaef6043f3ae)
    
    Fix test_misc for WebOb 1.5
    
    WebOb 1.5 was released at 2015-10-11. With this new version,
    webob.exc.WSGIHTTPException() constructor now fails with a KeyError
    when the HTTP status code is 0.
    
    test_exceptions_raise() of test_misc tries to instanciate all
    exceptions of cinder.exception. The problem is that
    ConvertedException uses a default HTTP status code of 0.
    
    Modify the default HTTP status code of ConvertedException to 400 to
    fix the unit test. The bug is only in the test,
    cinder/api/openstack/wsgi.py copies an existing HTTP code:
    
        Fault(exception.ConvertedException(code=ex_value.code,  ...)
    
    Closes-Bug: #1505153
    Change-Id: I1aec8038774828d48da4b0e831b390e33243809a
    (cherry picked from commit 867fccf833ffc597aa986cb6ff1b3b5c1101b9ba)
    
    Change default Exception code to 500
    
    As a part of the fix for LP#1505153, the invalid
    response of 0 was changed to 400 to fix a running
    issue with the new version of WebOb.
    
    It was pointed out after the fact  however that a
    500 might be more appropriate here.
    
    Additionally, other projects have implemented a 500
    as the default so for the sake of consistency we should
    consider doing the same.
    
    This patch just changes the 400 to a 500 as the default
    code.
    
    Conflicts:
            cinder/tests/unit/test_exception.py
    
    NOTE(mriedem): The conflict is due to 17802086f not being
    in stable/liberty.
    
    Change-Id: Ie486dc49c927f9b50f07c1fc562e89c090924a40
    Closes-Bug: #1505488
    (cherry picked from commit 9a7cbe540c94d54194194f4747a52b8211f6372e)

commit 5268a8d61beee1b18d14fd3738e763a0a61b00f1
Author: Xing Yang <email address hidden>
Date:   Wed Sep 23 11:22:43 2015 -0400

    Fix VMAX live migration problem
    
    Live migration fails for VMAX because the host is not taken into
    account when determining whether a volume is masked or not. For
    live migration it is necessary to know which host a volume is masked
    to. This patch fixes the problem by checking which host the volume
    is masked to.
    
    Change-Id: I693e29f7b26145bd1fd357b7d98377e26bfdfed8
    Closes-Bug: #1498964
    (cherry picked from commit 794e27c78255c94084b54821d44a36fd8f2096d7)

commit 2c09897f569a786998fd1ab50e42d81e9a2093a0
Author: OpenStack Proposal Bot <email address hidden>
Date:   Sat Oct 3 06:22:46 2015 +0000

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

commit f9e6c5f88c96bcbd181e991219d4ecbf9b8cf833
Author: Tom Swanson <email address hidden>
Date:   Tue Sep 29 10:26:48 2015 -0500

    Dell SC: cgsnapshot-delete doesn't actually delete
    
    dell_storagecenter_api.py was looking for the cgsnapshot for
    cgsnapshot-delete via the wrong REST API call.  It was also only
    looking for the first volume's snapshot rather than all snapshots
    associated with a cgsnapshot.  It now locates the snapshots properly
    and expires the associated replays on cgsnapshot-delete.
    
    Tests updated appropriately.
    
    Change-Id: I1e635db8b06d3d7a78573e6e8a2a4c25b7fb458d
    Closes-Bug: #1500583
    (cherry picked from commit e529e4d6cc71003c53126612dd869fa6fb23493a)

commit 4d42d496abf25630d1e6bd3ccf8c43ea1b754afb
Author: Wilson Liu <email address hidden>
Date:   Wed Sep 23 15:04:33 2015 +0800

    Huawei driver add check before use a QoS
    
    One QoS in Huawei storage array can contain at most 64 LUNs.
    Do a check before adding LUN to QoS, if the number of the
    LUNs in the QoS is already equal or larger than 64, then
    this QoS should not be used.
    
    Closed-Bug: #1498773
    Change-Id: I9dd78cc1378051ded135a885cfc9347d42977311
    (cherry picked from commit 32099d547a2bb9c5f21de4592c5bf08272fcb14c)

commit 6b7794a0d7c7a9eb76424eb2f7bd259d4f6ab0aa
Author: Wilson Liu <email address hidden>
Date:   Thu Sep 24 16:52:31 2015 +0800

    Report *real* free capacity in Huawei driver
    
    When we query capacity of a storage pool on Huawei storage,
    there are two items in the result: one is "USERFREECAPACITY"
    and the another one is "DATASPACE". In fact the "DATASPACE"
    is the *real* space we can use to create LUN, the
    "USERFREECAPACITY" contains some metadata that we can not use
    to store user data.
    
    Closes-Bug: #1499227
    Change-Id: I34a8c67dea2a7b7f5a2a693a65c9303b2cc3d972
    (cherry picked from commit e28e87258351c4c0d261d7c04ce495ef73e1520c)

commit bdfe5fa04e8e452c7262f265255b272f8fcfaa1d
Author: Goutham Pacha Ravi <email address hidden>
Date:   Fri Sep 25 01:52:43 2015 -0400

    Revert use of netapp_lib from NetApp Drivers
    
    This patch cleanly reverts the changes made via the
    commit: e681ba2a99995dcd999e6539bb1222f8a1ac8adc
    cleanly and mitigates the conflicts that would
    occur with git-revert on the said commit.
    
    The revert is solely for changes pertaining to the use
    of the external library, netapp_lib. Minor code refactors
    from the prior change are retained.
    
    Unit test coverage has been increased for ZAPI and REST
    interface code in netapp/dataontap/client/api.py and
    netapp/eseries/client.py.
    
    Closes-Bug: #1499334
    Change-Id: Icead7e168e1c7187840de87c69365d26aedd5924
    (cherry picked from commit ff81307ca4c796a66f4bd584b4633db07dcf2a16)

commit a20f797a3e00a7e9d9a8a1a3f5659b3b0266394e
Author: John Griffith <email address hidden>
Date:   Wed Sep 2 20:54:08 2015 -0600

    Add placholder for migration backports in Liberty
    
    Adding 5 placeholders for migration backports.
    
    Change-Id: Id3c4efbeee8bb1d800d71576d9de66ae9deb315a
    (cherry picked from commit 3c1d38882eca336bb7735ee8097d0236b2d94b1a)

commit cc0e6118f60964c162d6482dc96454ffec30e061
Author: Andreas Jaeger <email address hidden>
Date:   Thu Sep 24 21:14:13 2015 +0200

    Cleanup of Translations
    
    In preparation for the release, do some cleanups for translations.
    
    Removes all po files that are partially translated. The translation
    team has decided to exclude files with less than 66 % of translated
    content. There is no content lost, all data is in the translation
    server, we just remove it from the repository.
    
    This updates also recreates pot (translation source files) to
    reflect the state of the repository in case there was no recent
    import for them.
    
    This change needs to be done manually since the automatic import does
    not handle some of these cases.
    
    Change-Id: I7131dbf556627c5ad6fc237bab1e6b867f55c7f8