Merge "Use upper-constraints for tox"
authorJenkins <jenkins@review.openstack.org>
Thu, 18 May 2017 00:05:13 +0000 (00:05 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 18 May 2017 00:05:13 +0000 (00:05 +0000)

Trivial merge