Branch: refs/heads/1.5.x Home: https://github.com/hawkular/hawkular-alerts Commit: 38c6ae7e1df3eaf278d937c5c40194cd3ffe1c1d https://github.com/hawkular/hawkular-alerts/commit/38c6ae7e1df3eaf278d937... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2017-01-31 (Tue, 31 Jan 2017) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/GroupITest.groovy Log Message: ----------- HWKALERTS-216 Ensure disabled triggers are removed from the rulebase Commit: 2b72fecb17b87ab59a1e77189c559f6af30b8774 https://github.com/hawkular/hawkular-alerts/commit/2b72fecb17b87ab59a1e77... Author: dkorn <dkorn(a)redhat.com&gt; Date: 2017-01-31 (Tue, 31 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: bac45061d821b35d727ca7204b5d49e8ee574106 https://github.com/hawkular/hawkular-alerts/commit/bac45061d821b35d727ca7... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2017-01-31 (Tue, 31 Jan 2017) Changed paths: M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java Log Message: ----------- Update license headers for some cherry-picked files. Compare: https://github.com/hawkular/hawkular-alerts/compare/5f5d8801d4b7...bac450...