Merge "Fix unit tests failing against Puppet 4.3.0"
authorJenkins <jenkins@review.openstack.org>
Mon, 30 Nov 2015 20:22:21 +0000 (20:22 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 30 Nov 2015 20:22:21 +0000 (20:22 +0000)

Trivial merge