Merge "Expose enable_combination_alarm setting"
authorJenkins <jenkins@review.openstack.org>
Fri, 26 Aug 2016 18:01:00 +0000 (18:01 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 26 Aug 2016 18:01:00 +0000 (18:01 +0000)

Trivial merge