Merge "sahara: configure keystone_authtoken parameters"
authorJenkins <jenkins@review.openstack.org>
Thu, 9 Mar 2017 10:20:48 +0000 (10:20 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 9 Mar 2017 10:20:48 +0000 (10:20 +0000)

Trivial merge