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)
commit4c41280aee32fa9786c9da737fc8fec3909f71b3
treec10b40f0f8b04d2975e2ad7b851ded883036c980
parent0b6ce86e7ae59f25a6502269b216f16e2189708a
parent144f02fe196538c4a7a9d4c28adfc5978f0ca1b3
Merge "Updated from global requirements" into stable/ocata