tree a687dc29c936629085117a93724bbc8008fc3340
parent 1c6655e08903b896e4cf0ec6306a598c64d5bcf0
parent 17b6193be5e1ba8a8d35377a86b4ded2a4675fad
author Jenkins <jenkins@review.openstack.org> 1500977324 +0000
committer Gerrit Code Review <review@openstack.org> 1500977324 +0000

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