Merge "Remove the openvswitch special case upgrade code" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 9 Mar 2017 14:24:12 +0000 (14:24 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 9 Mar 2017 14:24:12 +0000 (14:24 +0000)

Trivial merge