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)
commitbdc175be26655580004af41b1fd2cfe612ebf953
tree6eeef0ef558f7a4888480082518e049d34a832b5
parent43b33c7ed8ae2b02dc552767eaa7eb1dec4fb2e1
parentffb7ba51e19caba276ee256f7083833e9bcf3b76
Merge "Merge pre|post puppet resources into pre|post config." into stable/ocata