Merge branch 'master' of https://github.com/openstack/cinder
Merge branch 'master' of https://github.com/openstack/cinder
Merge branch 'master' of https://github.com/openstack/cinder
Merge branch 'master' of https://github.com/openstack/cinder
Merge branch 'master' of https://github.com/openstack/cinder
Merge branch 'master' of https://github.com/openstack/cinder
changes
merge