Merge "Add support for not using admin_token in Ceph/RGW"
authorJenkins <jenkins@review.openstack.org>
Tue, 24 Jan 2017 15:47:36 +0000 (15:47 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 24 Jan 2017 15:47:36 +0000 (15:47 +0000)

Trivial merge