Merge "Changes for configuring Nuage"
authorJenkins <jenkins@review.openstack.org>
Wed, 2 Dec 2015 14:37:51 +0000 (14:37 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 2 Dec 2015 14:37:51 +0000 (14:37 +0000)

Trivial merge