Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: dc0cb35eaf4bfaeab08db97de8b8b41470e149c0 https://github.com/hawkular/hawkular-alerts/commit/dc0cb35eaf4bfaeab08db9... Author: dkorn <dkorn(a)redhat.com&gt; Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-rest/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- Dampening update: set correct TriggerId to dampening object When updating trigger dampening (also for a group trigger) with a wrong triggerId, the getCleanDampening() would generate a wrong dampening. In addition, in case of missing DampeningId or TriggerId, only the DampeningId is mentioned in the Bad Argument HTTP error message. This change also suggests a missing TriggerId. fixes: https://issues.jboss.org/browse/HWKALERTS-215 Commit: a1cc81f3ff0d40ed1c32ca46b53f70bae9da752d https://github.com/hawkular/hawkular-alerts/commit/a1cc81f3ff0d40ed1c32ca... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-rest/hawkular-alerts-rest-api/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- Merge pull request #283 from dkorn/update_dampening_triggerId Dampening update: set correct TriggerId to dampening object Compare: https://github.com/hawkular/hawkular-alerts/compare/f8b287380f38...a1cc81...