Merge "Add heat environment for disabling all telemetry services"
authorJenkins <jenkins@review.openstack.org>
Fri, 26 May 2017 15:32:46 +0000 (15:32 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 26 May 2017 15:32:46 +0000 (15:32 +0000)

Trivial merge