Merge "Make the openvswitch 2.4->2.5 upgrade more robust"
authorJenkins <jenkins@review.openstack.org>
Wed, 21 Dec 2016 10:28:54 +0000 (10:28 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 21 Dec 2016 10:28:54 +0000 (10:28 +0000)

Trivial merge