Merge "Disables QoS with OpenDaylight deployments" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Mon, 11 Sep 2017 15:40:15 +0000 (15:40 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 11 Sep 2017 15:40:15 +0000 (15:40 +0000)

Trivial merge