Merge "Update cinder-api with new authtoken parameters"
authorJenkins <jenkins@review.openstack.org>
Mon, 8 Aug 2016 13:54:36 +0000 (13:54 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 8 Aug 2016 13:54:36 +0000 (13:54 +0000)

Trivial merge