Merge "Fix ceph keyring setting for gnocchi"
authorJenkins <jenkins@review.openstack.org>
Fri, 27 May 2016 19:39:03 +0000 (19:39 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 27 May 2016 19:39:03 +0000 (19:39 +0000)

Trivial merge