Merge "Remove keystone PKI related parameters"
authorJenkins <jenkins@review.openstack.org>
Fri, 5 Aug 2016 23:18:07 +0000 (23:18 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 5 Aug 2016 23:18:07 +0000 (23:18 +0000)

Trivial merge