Merge "Deploy versionless keystone endpoints (for keystone only)" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Sun, 26 Mar 2017 14:10:27 +0000 (14:10 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 26 Mar 2017 14:10:27 +0000 (14:10 +0000)

Trivial merge