Merge "Update tox configuration"
authorJenkins <jenkins@review.openstack.org>
Thu, 18 May 2017 17:16:44 +0000 (17:16 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 18 May 2017 17:16:44 +0000 (17:16 +0000)

Trivial merge