Merge "Fix default for barbican documentation"
authorJenkins <jenkins@review.openstack.org>
Thu, 3 Nov 2016 10:07:47 +0000 (10:07 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 3 Nov 2016 10:07:47 +0000 (10:07 +0000)

Trivial merge