Merge "Make Nova VNC Proxy service name match service net map"
authorJenkins <jenkins@review.openstack.org>
Mon, 12 Sep 2016 07:28:20 +0000 (07:28 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 12 Sep 2016 07:28:20 +0000 (07:28 +0000)

Trivial merge