tree d7f2c068523e9ce8486133e0e94e8843dc2e6a1d
parent aa4f4c86c3da40b628808268da3f5303559691cf
parent 0419088f9d24ef95adbb5cc5a26c02c639521c5f
author Jenkins <jenkins@review.openstack.org> 1495613141 +0000
committer Gerrit Code Review <review@openstack.org> 1495613141 +0000

Merge "Replace the usage of 'os' with 'os_primary'"