[Hawkular-commits] [hawkular/hawkular-alerts] b69841: HWKALERTS-124 Unify import files into a single one

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: b698413358dc71d2bab343ab0dab8ccffb5d692d https://github.com/hawkular/hawkular-alerts/commit/b698413358dc71d2bab343... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-01-16 (Sat, 16 Jan 2016) Changed paths: A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonImport.java A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsImportManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/impl/AlertsImportManagerTest.java R hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions-data.json A hawkular-alerts-engine/src/test/resources/hawkular-alerts/alerts-data.json R hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions-data.json R hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening-data.json R hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json M hawkular-alerts-engine/src/test/resources/log4j.xml R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/actions-data.json A hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/alerts-data.json R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions-data.json R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/dampening-data.json R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json Log Message: ----------- HWKALERTS-124 Unify import files into a single one Commit: 4bbae978dd265f814be1d6ee9ec83354c67fc973 https://github.com/hawkular/hawkular-alerts/commit/4bbae978dd265f814be1d6... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-01-16 (Sat, 16 Jan 2016) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonImport.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- HWKALERTS-124 Add full trigger rests endpoint Commit: 5bfd0030e21710ae150ded228e77b60547eee0e6 https://github.com/hawkular/hawkular-alerts/commit/5bfd0030e21710ae150ded... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonImport.java A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsImportManager.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/impl/AlertsImportManagerTest.java R hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions-data.json A hawkular-alerts-engine/src/test/resources/hawkular-alerts/alerts-data.json R hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions-data.json R hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening-data.json R hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json M hawkular-alerts-engine/src/test/resources/log4j.xml M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/actions-data.json A hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/alerts-data.json R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions-data.json R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/dampening-data.json R hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- Merge pull request #151 from lucasponce/unify-init-files Unify init files Compare: https://github.com/hawkular/hawkular-alerts/compare/a2f56968ac83...5bfd00...