tree 7d6c4c62e656258e372dd33df265bba56a8368a3
parent a12fc2feb4b244092dcf37f8b3f7c5d22c88c94d
parent 3203253228b7e9173a922e8ec27569a9e56b25f1
author Jenkins <jenkins@review.openstack.org> 1499701011 +0000
committer Gerrit Code Review <review@openstack.org> 1499701011 +0000

Merge "Replace os with os_primary"