Merge "Enable heat/puppet to manage the fernet keys and make it configurable"
authorJenkins <jenkins@review.openstack.org>
Wed, 14 Jun 2017 16:26:57 +0000 (16:26 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 14 Jun 2017 16:26:57 +0000 (16:26 +0000)

Trivial merge