Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: 0a1fce6a800abe4a8136a232b4db477f7deee3bc https://github.com/hawkular/hawkular-alerts/commit/0a1fce6a800abe4a8136a2... Author: jshaughn <jshaughn(a)redhat.com&gt; Date: 2016-02-05 (Fri, 05 Feb 2016) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql Log Message: ----------- HWKALERTS-131 Re-use member dataIdMappings when updating group trigger conditions - persist the historical dataIdMappings used on member triggers - use them when updating group conditions, supplementing any provided mappings Commit: 9b9f9b66084a209b72c1544c882c680eb17f6771 https://github.com/hawkular/hawkular-alerts/commit/9b9f9b66084a209b72c154... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-02-06 (Sat, 06 Feb 2016) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql Log Message: ----------- Merge pull request #162 from jshaughn/hwkalerts-131 HWKALERTS-131 Re-use member dataIdMappings when updating group trigger conditions Compare: https://github.com/hawkular/hawkular-alerts/compare/a56fa7d8c2df...9b9f9b...