Merge "Use versionless keystone endpoint for barbican-related configurations"
authorJenkins <jenkins@review.openstack.org>
Thu, 26 Jan 2017 16:55:07 +0000 (16:55 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 26 Jan 2017 16:55:07 +0000 (16:55 +0000)

Trivial merge