Merge proposals dependent on lp://staging/~openstack-ubuntu-testing/cinder/folsom

lp://staging/~openstack-ubuntu-testing/cinder/folsom has no merge proposals.