Merge "Disable ComputeNeutron* for cisco-nexus-ucsm" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Tue, 16 May 2017 22:06:43 +0000 (22:06 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 16 May 2017 22:06:43 +0000 (22:06 +0000)

Trivial merge