tree ead1972fd5db396d22394c975486eb0079844e7b
parent 2e555bcc1d563e1844a7c0cacf17eca1f21fdeed
parent d6d8629107786a4b8c2a9a75dd0854ba81c70928
author Jenkins <jenkins@review.openstack.org> 1375146550 +0000
committer Gerrit Code Review <review@openstack.org> 1375146550 +0000

Merge "Simplify whitebox/manager"