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

commit 5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d
Author: John Griffith <email address hidden>
Date:   Thu Apr 23 12:07:12 2015 -0600

    Add external genconfig calls
    
    After moving to oslo.config we still were using
    incubator config generator.  This was ok, but the
    problem is we haven't been pulling config options
    from the oslo libs.
    
    This is a hack that just appends external lib calls
    and appends those options to the sample file being built.
    
    Change-Id: I2634b20ef4abd3bf7990f845d59ad3d208db234f
    (cherry picked from commit 51a22591a44932463847ed3247899db32ac49444)
    Closes-Bug: #1447380

commit b05274c96bc48e749e6ad21633b39158838c313e
Author: Brant Knudson <email address hidden>
Date:   Wed Apr 22 14:57:53 2015 -0500

    service child process normal SIGTERM exit
    
    service.py had some code where the child process would catch the
    SIGTERM from the parent just so it could exit with 1 status rather
    than with an indication that it exited due to SIGTERM. When
    shutting down the parent doesn't care in what way the child ended,
    only that they're all gone, so this code is unnecessary.
    
    Also, for some reason this caused the child to never exit while
    there was an open connection from a client. Probably something
    with eventlet and signal handling.
    
    This is a cherry-pick of oslo-incubator commit
    702bc569987854b602ef189655c201c348de84cb .
    
    Change-Id: I87f3ca4da64fb8070e4d6c3876a2f1ce1a3ca71d
    Closes-Bug: #1446583
    (cherry picked from commit d73ac96d18c66aa4dd5b7d7f8d7c22e8f8434683)

commit 2727e8865ce7b9ef4eec81f7f07b7a0726eb304b
Author: Lucian Petrut <email address hidden>
Date:   Fri Mar 27 14:15:25 2015 +0200

    Windows SMBFS: fix volume extend
    
    The Windows SMBFS driver inherits the Linux SMBFS driver,
    overriding Windows specific methods.
    
    This commit Ic89cffc93940b7b119cfcde3362f304c9f2875df added the
    volume name as an extra argument to the _do_extend_volume in order
    to check if differencing images are pointing to backing files other
    than the according volume disks.
    
    Although this is not required on Windows, this method should accept
    this extra argument in order to have the same signature as the
    method it overrides. At the moment, this raises the following
    exception:
    
    TypeError: _do_extend_volume() takes exactly 3 arguments (4 given)
    
    Closes-Bug: #1437290
    (cherry picked from commit dca29e9ab3cdde210d3777e7c6b4a6849447058a)
    Change-Id: I868d7de4a2c68f3fc520ba476a5660a84f440bb1

commit cc9bd73479ab4f0d14ee66eccab6fa285b8836b9
Author: Daisuke Fujita <email address hidden>
Date:   Wed Apr 15 14:03:31 2015 +0900

    Fix a wrong argument of create method
    
    Change the argument 'QoSSpecs.create' to 'qos_specs.create'.
    
    Closes-Bug: #1443331
    (cherry picked from commit a3c0a4104f95acff00d3a9721caa4da730619fb7)
    Change-Id: Iabebc5f1681be75fb06d836ea72b93de0a9d688e

commit 523080113d15bc5a207ebf89e82c4d4da486cbe0
Author: Andreas Jaeger <email address hidden>
Date:   Mon Apr 20 10:54:41 2015 +0200

    Release Import of Translations from Transifex
    
    This updates also recreates all pot (translation source files) to
    reflect the state of the repository.
    
    This change needs to be done manually since the automatic import does
    not handle the proposed branches and we need to sync with latest
    translations.
    
    Note: This is part of importing of translations, there are no new
    translations for this project, thus only the pot file gets updated.
    
    Change-Id: Ib472c156a7007b2166c6857ae1fa2bb72a2e0c1a

commit ae6c589c52557988e24b5ee8005d8f81564a6068
Author: Thierry Carrez <email address hidden>
Date:   Fri Apr 17 10:31:32 2015 +0200

    update .gitreview for stable/kilo
    
    Change-Id: I64a4fc6af6f83b2d8a6bb5fe9aa0dc3acd58e4ce

commit 6ecdf1427359252658315412554e8c3488e8f050
Author: OpenStack Proposal Bot <email address hidden>
Date:   Thu Apr 16 12:04:22 2015 +0000

    Updated from global requirements
    
    Change-Id: I49730dab41606a457645ca33d6af79639001a0f4

commit 0c467970f12cc7212cc43ee210e6386d083b5ef9
Author: ankitagrawal <email address hidden>
Date:   Tue Mar 17 02:08:12 2015 -0700

    Verify all quotas before updating the database
    
    Update quota multi-value in one request is not an atomic operation, so
    even if a quota is invalid (e.g., volumes has a non-integer value),
    some values may change but the response code is 400.
    
    This patch will make sure the quota limits are of integer type for all
    the requested quota keys before updating the database.
    
    Closes-Bug: 1432972
    Change-Id: If83af0a80489887098e52b03b9c4012e3ef061b5
    (cherry picked from commit 197299985a52535ad995dbd111491b58462f140a)

commit 3c3e1d8db5ff64156ab345c375549021db55b8a2
Author: Patrick East <email address hidden>
Date:   Tue Apr 14 18:42:19 2015 -0700

    Add locking to PureISCSIDriver around creating Purity Host objects.
    
    This will prevent us from getting conflicting credentials for
    connection methods which will result in iSCSI attach operations to fail.
    
    Change-Id: Ia206e7b5ff330c8fccb49ed23a31b120a5c04eb3
    Closes-Bug: 1444224
    (cherry picked from commit a712afe42833443878898bb42851376cd8615ff9)

commit 51bfd201e888caecf8dbdce8c8999bfa8ed05a26
Author: Jon Bernard <email address hidden>
Date:   Tue Apr 7 13:57:36 2015 -0400

    Include boot properties from glance v2 images
    
    In order for users to take advantage of COW volumes created from
    a glance image, Cinder must be configured to use Glance API version
    2 (default is 1). In version 2, the required boot metadata (kernel_id
    and ramdisk_id) are no long stored in the 'properties' dict, but as
    standalone fields in the GET response from glance. The existing cinder
    parser for the glance request is not aware of this and the volume
    created form a v2 image will lack this required metadata.
    
    This was causing the recent Ceph CI gate failures for
    test_volume_boot_pattern.
    
    Change-Id: I688898b3841691369d73887f7eabdceb05155db1
    Closes-Bug: #1439371
    (cherry picked from commit ea109b5f24dca93fd6f660bc436a685d6101bcea)