Merge "Fix nova-cpu/collectd hieradata" into stable/pike
authorZuul <zuul@review.openstack.org>
Fri, 3 Nov 2017 22:57:04 +0000 (22:57 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 3 Nov 2017 22:57:04 +0000 (22:57 +0000)
commit97ef5a574d3df23b68dd2a9eaa66a7923fce8d39
tree4587ba066ed01c8d9b5ae03de18fe93972e1c90e
parent949c31fdd61059f18690ab85dc9078331e8d0574
parent4a08ce600fe7c3da33acc0a4365508236263a72a
Merge "Fix nova-cpu/collectd hieradata" into stable/pike