Updated openstack/openstack
Project: openstack/nova  63152f9a8c983bf6efadd0f308841ff1d98b5d24
null
Remove uneeded dhcp_opts initialization

Change-Id: I4fcb977f01b2d22fb445d11ad6953fc1bfaff4a8
Updated openstack/openstack
Project: openstack/cinder  9062dffb87cc7c4a3250c6d6a53ae676f2cd295c
null
add 'force' verification in _volume_upload_image

_volume_upload_image API should only support to upload 'in-use' volume to
image when assign 'force' parameter as true value. Now
_volume_upload_image API does not do verification for 'force' parameter,
so we can upload 'in-use' volume to image when assign 'force' parameter
with string value 'false' or 'false111'. This patch add verification for
'force' parameter.

Change-Id: I9e1d0e517d0ff97c136903dd6e50a305e18651f3
Closes-Bug: #1265718