Merge "Updated from global requirements"
authorJenkins <jenkins@review.openstack.org>
Tue, 25 Apr 2017 19:50:26 +0000 (19:50 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 25 Apr 2017 19:50:26 +0000 (19:50 +0000)

Trivial merge