Merge "Remove Combination alarms support"
authorJenkins <jenkins@review.openstack.org>
Wed, 23 Nov 2016 15:57:20 +0000 (15:57 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 23 Nov 2016 15:57:20 +0000 (15:57 +0000)

Trivial merge