Merge "Remove Heat Cloudwatch API during upgrade and disable by default" into stable...
authorZuul <zuul@review.openstack.org>
Thu, 19 Oct 2017 09:11:27 +0000 (09:11 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 19 Oct 2017 09:11:27 +0000 (09:11 +0000)

Trivial merge