Merge "Make build_endpoint_map.py output an ocata versioned template"
authorJenkins <jenkins@review.openstack.org>
Wed, 11 Jan 2017 18:56:48 +0000 (18:56 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 11 Jan 2017 18:56:48 +0000 (18:56 +0000)

Trivial merge