Updated openstack/openstack
Project: openstack/cinder  935107d5a28e644a046e4a64782c0bd4bb8a7ab0
null
Update SolidFire Driver to use cinder's units

The SolidFire driver uses math module and it's own
local GB variable.

This patch just removes that and uses the GiB def
that already exists in cinder.units.

Change-Id: I4fc167bd61dbb609bd325b4a32b120bf55db02fa
Updated openstack/openstack
Project: openstack-dev/devstack  fa969f3c60bb0d5bcd96ebfa063b46367884111e
null
upload_image.sh to support streamOptimized disks

The current version of the script will use "preallocated" as the
disk type of a stream optimized disk. This needs to be fixed by
introspecting the createType of the vmdk file.

Closes-Bug: #1275993

Change-Id: I98594acecf26dd1164870f43890254a19ef23fe9