Merge "Handle upgrading cinder-volume under pacemaker"
authorJenkins <jenkins@review.openstack.org>
Fri, 2 Jun 2017 15:33:42 +0000 (15:33 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 2 Jun 2017 15:33:42 +0000 (15:33 +0000)

Trivial merge