Merge "Merge pre|post puppet resources into pre|post config." into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Fri, 12 May 2017 03:06:32 +0000 (03:06 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 12 May 2017 03:06:32 +0000 (03:06 +0000)

Trivial merge