Merge "Ensure combination alarm evaluator can be loaded" into milesto…

…ne-proposed
openstack · Oct 10, 2013 · 5a968d2 · 5a968d2
2 parents 4a73909 + a733e91
commit 5a968d2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -104,6 +104,7 @@ ceilometer.publisher =
 
 ceilometer.alarm.evaluator =
     threshold = ceilometer.alarm.evaluator.threshold:ThresholdEvaluator
+    combination = ceilometer.alarm.evaluator.combination:CombinationEvaluator
 
 ceilometer.alarm.notifier =
     log = ceilometer.alarm.notifier.log:LogAlarmNotifier