Merge "Disable VIPs before stopping cluster during version upgrade"
authorJenkins <jenkins@review.openstack.org>
Wed, 4 May 2016 11:14:00 +0000 (11:14 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 4 May 2016 11:14:00 +0000 (11:14 +0000)

Trivial merge