Merge "Add class to set noop on various puppet resources"
authorJenkins <jenkins@review.openstack.org>
Thu, 9 Jul 2015 15:01:29 +0000 (15:01 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 9 Jul 2015 15:01:29 +0000 (15:01 +0000)

Trivial merge