Merge "Handle upgrading cinder-volume under pacemaker" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Mon, 5 Jun 2017 19:26:15 +0000 (19:26 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 5 Jun 2017 19:26:15 +0000 (19:26 +0000)

Trivial merge