Merge "Add special case upgrade from openvswitch 2.5.0-14" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Mon, 3 Apr 2017 09:56:40 +0000 (09:56 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 3 Apr 2017 09:56:40 +0000 (09:56 +0000)

Trivial merge