Merge "Updated from global requirements" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Fri, 2 Jun 2017 23:57:27 +0000 (23:57 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 2 Jun 2017 23:57:27 +0000 (23:57 +0000)

Trivial merge