Merge "Add NovaVNCProxy back into endpoint_map"
authorJenkins <jenkins@review.openstack.org>
Fri, 26 Feb 2016 23:37:23 +0000 (23:37 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 26 Feb 2016 23:37:23 +0000 (23:37 +0000)

Trivial merge