Merge "Fix for the resource ControllerPostPuppetMaintenanceModeDeployment"
authorJenkins <jenkins@review.openstack.org>
Tue, 2 May 2017 19:02:26 +0000 (19:02 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 2 May 2017 19:02:26 +0000 (19:02 +0000)

Trivial merge