cinder
Merge branch 'juno-20140730' of https://github.com/troublehead/openstack into juno-20140730