[Hawkular-commits] [hawkular/hawkular-alerts] 86e78e: [HWKALERTS-2] Initial support for Trigger Safety M...

Wed Mar 18 16:43:22 EDT 2015

  Branch: refs/heads/master
  Home:   https://github.com/hawkular/hawkular-alerts
  Commit: 86e78ed9f6e21bf67cc24ac7ab205a74facb1c69
      https://github.com/hawkular/hawkular-alerts/commit/86e78ed9f6e21bf67cc24ac7ab205a74facb1c69
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
    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/model/trigger/TriggerTemplate.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java

  Log Message:
  -----------
  [HWKALERTS-2] Initial support for Trigger Safety Mode
A Trigger can now be in FIRE mode or SAFETY mode. A Condition set and
Dampening can be defined for both modes on the same Trigger. Based on the
Trigger's current mode the relevant conditions and dampening will be used
for evaluations.
- introduce trigger mode across the various constructor/hashcode/equals/toStrings
- add safetyEnabled to indicate that safety conditions are set and enabled
- make ConditionEval.getLog() impls more verbose w/ timestamp info
- update the DB and File def service impls as needed
- add test code

ToDo: Currently satisfying the safety dampening only toggles the Trigger
      back to fire mode.  We need to discuss whether we should be generating
      an alert and/or performing actions.

  Commit: 0494d8d9792f7c5fdba644016ac372ac17310afb
      https://github.com/hawkular/hawkular-alerts/commit/0494d8d9792f7c5fdba644016ac372ac17310afb
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  [HWKALERTS-2] rebase on master, fix test failures

  Commit: 88b714306d5b0821a94ac48b1c25f856598a3542
      https://github.com/hawkular/hawkular-alerts/commit/88b714306d5b0821a94ac48b1c25f856598a3542
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java

  Log Message:
  -----------
  [HWKALERTS-2] use trigger mode name as opposed to ordinal in Condition id.

  Commit: 104e158946c319e12103083cc31bfdd4a55927b5
      https://github.com/hawkular/hawkular-alerts/commit/104e158946c319e12103083cc31bfdd4a55927b5
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java

  Log Message:
  -----------
  Fix some potential NPE's in debug logging.

  Commit: 3669fb4f7c2fab93b7e60ce201d853d930fbd88d
      https://github.com/hawkular/hawkular-alerts/commit/3669fb4f7c2fab93b7e60ce201d853d930fbd88d
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
    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/model/trigger/TriggerTemplate.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.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/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifiersHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Potential model, API revisions for review (branched off trigger safety PR)
** work in progress, compiling only **

- fix up some equals/hashcode logic
  - use Trigger.triggerId as unique key
    - make TriggerTemplate abstract and set match fields as transient
  - give Dampening a unique key: dampeningId

- Introduce trigger-granular reload so that changes to a trigger don't
  force a global reload but just a reload of the affected trigger.
  - add support in RulesEngine for get/removeFacts

- Various changes to definitions service
  - move torwards a more trigger-centric model
    - support full conditionSet replacement
  - introduce triggerMode into the api
  - use dampening's unique key
  - add jdoc

- DB table changes
  - introduce dampeningId into the tables
  - introduce triggerMode into the tables

- remove MemDefinitionsServiceImpl

  Commit: 7676c0c7dcecc493b3b1675d5a01461c3b3b1ba8
      https://github.com/hawkular/hawkular-alerts/commit/7676c0c7dcecc493b3b1675d5a01461c3b3b1ba8
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AbstractTestBase.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/StringConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdRangeConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy

  Log Message:
  -----------
  Fixes to services, rest handlers, and test

  Commit: 6f20b6a86950d7e9fb5bcf6059ea8a80924e846c
      https://github.com/hawkular/hawkular-alerts/commit/6f20b6a86950d7e9fb5bcf6059ea8a80924e846c
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java

  Log Message:
  -----------
  Fix for recursive dependency between Definitions & Alerts services

  Commit: 5e975a0a026beb906213647de7f6179a453e6b3c
      https://github.com/hawkular/hawkular-alerts/commit/5e975a0a026beb906213647de7f6179a453e6b3c
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java

  Log Message:
  -----------
  Merge pull request #20 from lucasponce/jshaughn/api

Fix for recursive dependency between Definitions & Alerts services

  Commit: 6988d6e854fdbd40a4a8d20592e4e50ed3d56d23
      https://github.com/hawkular/hawkular-alerts/commit/6988d6e854fdbd40a4a8d20592e4e50ed3d56d23
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    R examples/example-alerts-ui/pom.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/jboss-web.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/web.xml
    R examples/example-alerts-ui/src/main/webapp/index.jsp
    A hawkular-actions-api/pom.xml
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/log/MsgLogger.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionMessage.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionPluginMessage.java
    A hawkular-actions-email/pom.xml
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/registration/RegistrationInit.java
    A hawkular-actions-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-email/src/main/webapp/index.jsp
    A hawkular-actions-sms/pom.xml
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/listener/SmsListener.java
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/registration/RegistrationInit.java
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-sms/src/main/webapp/index.jsp
    A hawkular-actions-snmp/pom.xml
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/listener/SnmpListener.java
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/registration/RegistrationInit.java
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-snmp/src/main/webapp/index.jsp
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/notification/Notification.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionListener.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionsService.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotificationsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotifierListener.java
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/AlertEngineRegister.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginListener.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/NotifierTypeListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/NotificationSender.java
    M hawkular-alerts-ear/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemActionsServiceImpl.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemNotificationsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java
    A hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
    R hawkular-alerts-engine/src/main/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    A hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
    R hawkular-alerts-engine/src/test/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotificationHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifierTypeHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifiersHandler.java
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/NotifiersTest.groovy
    R hawkular-notifiers-api/pom.xml
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/log/MsgLogger.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotificationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierRegistrationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierTypeRegistrationMessage.java
    R hawkular-notifiers-email/pom.xml
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/notifications/EmailListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegisterListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegistrationInit.java
    R hawkular-notifiers-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-email/src/main/webapp/index.jsp
    R hawkular-notifiers-sms/pom.xml
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/notifications/SmsListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegisterListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegistrationInit.java
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-sms/src/main/webapp/index.jsp
    R hawkular-notifiers-snmp/pom.xml
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/notifications/SnmpListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegisterListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegistrationInit.java
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-snmp/src/main/webapp/index.jsp
    M pom.xml

  Log Message:
  -----------
  HWKALERTS-24 Refactoring of notifications

  Commit: dcdf1f66a8456f415256b383a69532dbc87c84f1
      https://github.com/hawkular/hawkular-alerts/commit/dcdf1f66a8456f415256b383a69532dbc87c84f1
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    R examples/example-alerts-ui/pom.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/jboss-web.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/web.xml
    R examples/example-alerts-ui/src/main/webapp/index.jsp
    A hawkular-actions-api/pom.xml
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/log/MsgLogger.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionMessage.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionPluginMessage.java
    A hawkular-actions-email/pom.xml
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/registration/RegistrationInit.java
    A hawkular-actions-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-email/src/main/webapp/index.jsp
    A hawkular-actions-sms/pom.xml
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/listener/SmsListener.java
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/registration/RegistrationInit.java
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-sms/src/main/webapp/index.jsp
    A hawkular-actions-snmp/pom.xml
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/listener/SnmpListener.java
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/registration/RegistrationInit.java
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-snmp/src/main/webapp/index.jsp
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/notification/Notification.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionListener.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionsService.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotificationsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotifierListener.java
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/AlertEngineRegister.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginListener.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/NotifierTypeListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/NotificationSender.java
    M hawkular-alerts-ear/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemActionsServiceImpl.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemNotificationsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java
    A hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
    R hawkular-alerts-engine/src/main/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    A hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
    R hawkular-alerts-engine/src/test/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotificationHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifierTypeHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifiersHandler.java
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/NotifiersTest.groovy
    R hawkular-notifiers-api/pom.xml
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/log/MsgLogger.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotificationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierRegistrationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierTypeRegistrationMessage.java
    R hawkular-notifiers-email/pom.xml
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/notifications/EmailListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegisterListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegistrationInit.java
    R hawkular-notifiers-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-email/src/main/webapp/index.jsp
    R hawkular-notifiers-sms/pom.xml
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/notifications/SmsListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegisterListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegistrationInit.java
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-sms/src/main/webapp/index.jsp
    R hawkular-notifiers-snmp/pom.xml
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/notifications/SnmpListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegisterListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegistrationInit.java
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-snmp/src/main/webapp/index.jsp
    M pom.xml

  Log Message:
  -----------
  Merge pull request #21 from lucasponce/wintermute-ACTIONS

HWKALERTS-24 Refactoring of notifications

  Commit: e7da0458c3c261e1c679fe4033a8e05a44b5a763
      https://github.com/hawkular/hawkular-alerts/commit/e7da0458c3c261e1c679fe4033a8e05a44b5a763
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M README.adoc
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data

  Log Message:
  -----------
  Fix documentation for actions

  Commit: 853f26351af9a9cedf751f831f8d20d0446d957a
      https://github.com/hawkular/hawkular-alerts/commit/853f26351af9a9cedf751f831f8d20d0446d957a
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    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/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java

  Log Message:
  -----------
  A few possible additions to Wintermute
- provide a default UUID triggerId if a triggerId is not provided. In most
  prod cases it seems a generated ID will be desirable. users/apps will likely
  not be able to provide a unique ID on their own.
- pull getDataId() down into the Condition base class as it is common to
  almost all conditions and makes coding easier.
- Add a copyTrigger to the definitions service. This is experimental, the
  idea being to enable using a Tokenized Trigger and generating a bunch
  of explicit triggers by provising a map of token dataIds to real dataids.

  Commit: 306563731f4e0cf627c57641ed07dc9fba564a62
      https://github.com/hawkular/hawkular-alerts/commit/306563731f4e0cf627c57641ed07dc9fba564a62
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java
    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/model/trigger/TriggerTemplate.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy

  Log Message:
  -----------
  Add Json anotations into API model

  Commit: 22d89d27b394b18e6723964ec3895c92b61bdecb
      https://github.com/hawkular/hawkular-alerts/commit/22d89d27b394b18e6723964ec3895c92b61bdecb
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java
    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/model/trigger/TriggerTemplate.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy

  Log Message:
  -----------
  Merge pull request #22 from lucasponce/MODEL-Reviewed

Add Json anotations into API model

  Commit: 2cc71699baebf2b33b7dca5b9bc222b952e5f98f
      https://github.com/hawkular/hawkular-alerts/commit/2cc71699baebf2b33b7dca5b9bc222b952e5f98f
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  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/model/trigger/TriggerTemplate.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java

  Log Message:
  -----------
  Fix json visibility only for definition

  Commit: 26fb6af52de82652b6dad2fd6afea9a7a76d5ddd
      https://github.com/hawkular/hawkular-alerts/commit/26fb6af52de82652b6dad2fd6afea9a7a76d5ddd
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/pom.xml
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/StringConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdRangeConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy

  Log Message:
  -----------
  Update REST endpoints to new API

  Commit: ddbc2d1529b2b8e2d6297f9963d1adbe75ebb8c2
      https://github.com/hawkular/hawkular-alerts/commit/ddbc2d1529b2b8e2d6297f9963d1adbe75ebb8c2
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    R examples/example-alerts-ui/pom.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/jboss-web.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/web.xml
    R examples/example-alerts-ui/src/main/webapp/index.jsp
    A hawkular-actions-api/pom.xml
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/log/MsgLogger.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionMessage.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionPluginMessage.java
    A hawkular-actions-email/pom.xml
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/registration/RegistrationInit.java
    A hawkular-actions-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-email/src/main/webapp/index.jsp
    A hawkular-actions-sms/pom.xml
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/listener/SmsListener.java
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/registration/RegistrationInit.java
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-sms/src/main/webapp/index.jsp
    A hawkular-actions-snmp/pom.xml
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/listener/SnmpListener.java
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/registration/RegistrationInit.java
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-snmp/src/main/webapp/index.jsp
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/notification/Notification.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionListener.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionsService.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotificationsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotifierListener.java
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/AlertEngineRegister.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginListener.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/NotifierTypeListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/NotificationSender.java
    M hawkular-alerts-ear/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemActionsServiceImpl.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemNotificationsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java
    A hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
    R hawkular-alerts-engine/src/main/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    A hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
    R hawkular-alerts-engine/src/test/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotificationHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifierTypeHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifiersHandler.java
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/NotifiersTest.groovy
    R hawkular-notifiers-api/pom.xml
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/log/MsgLogger.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotificationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierRegistrationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierTypeRegistrationMessage.java
    R hawkular-notifiers-email/pom.xml
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/notifications/EmailListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegisterListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegistrationInit.java
    R hawkular-notifiers-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-email/src/main/webapp/index.jsp
    R hawkular-notifiers-sms/pom.xml
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/notifications/SmsListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegisterListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegistrationInit.java
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-sms/src/main/webapp/index.jsp
    R hawkular-notifiers-snmp/pom.xml
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/notifications/SnmpListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegisterListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegistrationInit.java
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-snmp/src/main/webapp/index.jsp
    M pom.xml

  Log Message:
  -----------
  HWKALERTS-24 Refactoring of notifications

  Commit: a0eb126fd948cf443afda30113dde76bf523dfd3
      https://github.com/hawkular/hawkular-alerts/commit/a0eb126fd948cf443afda30113dde76bf523dfd3
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M README.adoc
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data

  Log Message:
  -----------
  Fix documentation for actions

  Commit: c70d11f9723ba460cc68ab982b8e0b329354c9f4
      https://github.com/hawkular/hawkular-alerts/commit/c70d11f9723ba460cc68ab982b8e0b329354c9f4
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java
    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/model/trigger/TriggerTemplate.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy

  Log Message:
  -----------
  Add Json anotations into API model

  Commit: a5ef67b0de0dc95b2ed3631870324d9f69947fc0
      https://github.com/hawkular/hawkular-alerts/commit/a5ef67b0de0dc95b2ed3631870324d9f69947fc0
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  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/model/trigger/TriggerTemplate.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java

  Log Message:
  -----------
  Fix json visibility only for definition

  Commit: 2ac8f5b2ac297a13d2ec3ae97866d696a0d7789d
      https://github.com/hawkular/hawkular-alerts/commit/2ac8f5b2ac297a13d2ec3ae97866d696a0d7789d
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java

  Log Message:
  -----------
  The 'metricType' field is no longer sent as part of H Metric's SingleMetric,
removing for compatibility.

  Commit: 65365218a374c9a9327fad623287a95c114c310a
      https://github.com/hawkular/hawkular-alerts/commit/65365218a374c9a9327fad623287a95c114c310a
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M hawkular-actions-api/pom.xml
    M hawkular-actions-email/pom.xml
    M hawkular-actions-sms/pom.xml
    M hawkular-actions-snmp/pom.xml
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-ear/pom.xml
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-rest/pom.xml
    M pom.xml

  Log Message:
  -----------
  change versions

  Commit: 18f46cc1aaa87f33b7d483b910ed0563d7b017bf
      https://github.com/hawkular/hawkular-alerts/commit/18f46cc1aaa87f33b7d483b910ed0563d7b017bf
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  move to latest parent pom

  Commit: 60361f3c1a558f59f2b848c08f2401c58894b663
      https://github.com/hawkular/hawkular-alerts/commit/60361f3c1a558f59f2b848c08f2401c58894b663
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java

  Log Message:
  -----------
  A few possible additions to Wintermute
- provide a default UUID triggerId if a triggerId is not provided. In most
  prod cases it seems a generated ID will be desirable. users/apps will likely
  not be able to provide a unique ID on their own.
- pull getDataId() down into the Condition base class as it is common to
  almost all conditions and makes coding easier.
- Add a copyTrigger to the definitions service. This is experimental, the
  idea being to enable using a Tokenized Trigger and generating a bunch
  of explicit triggers by provising a map of token dataIds to real dataids.

  Commit: 38e6ae6e6784bd1ea19e82b3475f788bf3b4d05a
      https://github.com/hawkular/hawkular-alerts/commit/38e6ae6e6784bd1ea19e82b3475f788bf3b4d05a
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/GsonAdapter.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AlertsTest.groovy

  Log Message:
  -----------
  - Add support for Alert persistence
  - Add support for criteria-based Alert query
  - Remove memory-based Alert caching
  - change Alert.time to Alert.ctime for clarity and possibility of more associated times
  - let CompareCondition properly use the inherited Condition.dataId
- Add preliminary tag support

TODO: Rest service support

  Commit: 92d823a15c4f2f768f7d795709390a4d8bcd9b53
      https://github.com/hawkular/hawkular-alerts/commit/92d823a15c4f2f768f7d795709390a4d8bcd9b53
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AlertsTest.groovy

  Log Message:
  -----------
  Add rest service for fetching alerts by criteria

  Commit: d487a0be2932432aeef0354d30316037e5abe221
      https://github.com/hawkular/hawkular-alerts/commit/d487a0be2932432aeef0354d30316037e5abe221
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy

  Log Message:
  -----------
  Fix some notifier wording for actions

  Commit: 4c9565f1d83316141d633e16b32ff1f3147f519f
      https://github.com/hawkular/hawkular-alerts/commit/4c9565f1d83316141d633e16b32ff1f3147f519f
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  Refactor dampening rest endpoint

  Commit: f411b9563cb71467bd2651350f578d6b22e52c64
      https://github.com/hawkular/hawkular-alerts/commit/f411b9563cb71467bd2651350f578d6b22e52c64
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  Missing conditionId used for REST endpoints

  Commit: 59c24eab67bd82c5b9c410d201ca5fa1b49be378
      https://github.com/hawkular/hawkular-alerts/commit/59c24eab67bd82c5b9c410d201ca5fa1b49be378
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java

  Log Message:
  -----------
  Fix action plugins query

  Commit: 5ee0a13331f45d249bfbafda2fdb6b5a181828fa
      https://github.com/hawkular/hawkular-alerts/commit/5ee0a13331f45d249bfbafda2fdb6b5a181828fa
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.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/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy

  Log Message:
  -----------
  - Add Tag support to DefinitionsService
- Add Tag support to Rest services (TriggersHandler)

We have some formatter inconsistency between eclipse and intellij. param
annotations and field-aligned indentation are problems.  Some format changes
to accommodate Eclipse, maybe IJ will be OK with it.

  Commit: 5a68e14da7a1e1c29060c478c5fe935f30ead7f3
      https://github.com/hawkular/hawkular-alerts/commit/5a68e14da7a1e1c29060c478c5fe935f30ead7f3
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java

  Log Message:
  -----------
  Adding reload trigger rest endpoint

  Commit: 590012aa13d2db04dc85c59c04acb56b805e60c2
      https://github.com/hawkular/hawkular-alerts/commit/590012aa13d2db04dc85c59c04acb56b805e60c2
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    A hawkular-actions-email/src/main/webapp/index.jsp~HEAD
    A hawkular-actions-email/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications
    A hawkular-actions-sms/src/main/webapp/index.jsp~5ee0a13331f45d249bfbafda2fdb6b5a181828fa
    A hawkular-actions-sms/src/main/webapp/index.jsp~HEAD
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HEAD
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HEAD_0
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications
    A hawkular-actions-snmp/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications_0

  Log Message:
  -----------
  HWKALERTS-24 Refactoring of notifications

  Commit: d6bfbedf3d6dd07d2f75e616cce1e10a4f6fb2b4
      https://github.com/hawkular/hawkular-alerts/commit/d6bfbedf3d6dd07d2f75e616cce1e10a4f6fb2b4
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/pom.xml
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/StringConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdRangeConditionsTest.groovy

  Log Message:
  -----------
  Update REST endpoints to new API

  Commit: a87741dd8505a4014782cbc1c7a280287154b253
      https://github.com/hawkular/hawkular-alerts/commit/a87741dd8505a4014782cbc1c7a280287154b253
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy

  Log Message:
  -----------
  Fix some notifier wording for actions

  Commit: 3648172484ee7927abb082ae924cfe6c95deab31
      https://github.com/hawkular/hawkular-alerts/commit/3648172484ee7927abb082ae924cfe6c95deab31
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  Refactor dampening rest endpoint

  Commit: 2a44ad3cece0e0030b4b6d27bcc8c8160c6b1ed7
      https://github.com/hawkular/hawkular-alerts/commit/2a44ad3cece0e0030b4b6d27bcc8c8160c6b1ed7
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy

  Log Message:
  -----------
  Missing conditionId used for REST endpoints

  Commit: 2d68ee013281c36d8a9d47325509dc7d44538c60
      https://github.com/hawkular/hawkular-alerts/commit/2d68ee013281c36d8a9d47325509dc7d44538c60
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java

  Log Message:
  -----------
  Fix action plugins query

  Commit: ac89f1490cc28093cee548096e910357c544c78b
      https://github.com/hawkular/hawkular-alerts/commit/ac89f1490cc28093cee548096e910357c544c78b
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    R hawkular-actions-email/src/main/webapp/index.jsp
    R hawkular-actions-snmp/src/main/webapp/index.jsp
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java

  Log Message:
  -----------
  HWKALERTS-24 Refactoring of notifications

  Commit: 174dfc816cab089890bc34244ac2975425d395e5
      https://github.com/hawkular/hawkular-alerts/commit/174dfc816cab089890bc34244ac2975425d395e5
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl

  Log Message:
  -----------
  Add Json anotations into API model

  Commit: 4d205b75d9460f563e8ef1f464c24e81c570eab7
      https://github.com/hawkular/hawkular-alerts/commit/4d205b75d9460f563e8ef1f464c24e81c570eab7
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Fix merge issues due to rebase wintermute.

  Commit: a2476cf1195b819dec06a1d3404bf56b0f72db16
      https://github.com/hawkular/hawkular-alerts/commit/a2476cf1195b819dec06a1d3404bf56b0f72db16
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Merge branch 'winter/uuid' of github.com:hawkular/hawkular-alerts into winter/uuid

Conflicts:
	examples/example-alerts-ui/src/main/webapp/index.jsp
	hawkular-actions-email/src/main/webapp/index.jsp
	hawkular-actions-email/src/main/webapp/index.jsp~HEAD
	hawkular-actions-email/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications
	hawkular-actions-sms/src/main/webapp/index.jsp
	hawkular-actions-snmp/src/main/webapp/index.jsp
	hawkular-actions-snmp/src/main/webapp/index.jsp~HEAD
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
	hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
	hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
	hawkular-notifiers-email/src/main/webapp/index.jsp
	hawkular-notifiers-sms/src/main/webapp/index.jsp
	hawkular-notifiers-snmp/src/main/webapp/index.jsp

  Commit: 1cbf00a833bf6288e0d487bcd65ab553d830e51f
      https://github.com/hawkular/hawkular-alerts/commit/1cbf00a833bf6288e0d487bcd65ab553d830e51f
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    R hawkular-actions-sms/src/main/webapp/index.jsp

  Log Message:
  -----------
  Merge branch 'winter/uuid' into wintermute

Conflicts:
	hawkular-actions-email/src/main/webapp/index.jsp
	hawkular-actions-email/src/main/webapp/index.jsp~HEAD
	hawkular-actions-email/src/main/webapp/index.jsp~HWKALERTS-24 Refactoring of notifications
	hawkular-actions-snmp/src/main/webapp/index.jsp
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
	hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
	hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
	hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy
	hawkular-notifiers-sms/src/main/webapp/index.jsp
	hawkular-notifiers-snmp/src/main/webapp/index.jsp

  Commit: 5106bf2324af7c005943fc2174922113f5f3e23a
      https://github.com/hawkular/hawkular-alerts/commit/5106bf2324af7c005943fc2174922113f5f3e23a
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    A hawkular-actions-sms/src/main/webapp/index.jsp
    R hawkular-actions-sms/src/main/webapp/index.jsp~5ee0a13331f45d249bfbafda2fdb6b5a181828fa
    R hawkular-actions-sms/src/main/webapp/index.jsp~HEAD

  Log Message:
  -----------
  fix merge issue

  Commit: 8b2afbfe5eadb1408684b60c8ecaac28721adce3
      https://github.com/hawkular/hawkular-alerts/commit/8b2afbfe5eadb1408684b60c8ecaac28721adce3
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-actions-api/pom.xml
    M hawkular-actions-email/pom.xml
    M hawkular-actions-sms/pom.xml
    M hawkular-actions-snmp/pom.xml
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
    M hawkular-alerts-ear/pom.xml
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/GsonAdapter.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-rest/pom.xml
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AlertsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy
    M pom.xml

  Log Message:
  -----------
  Merge branch 'winter/uuid' into wintermute

Conflicts:
	hawkular-actions-email/src/main/webapp/index.jsp
	hawkular-actions-email/src/main/webapp/index.jsp~HEAD
	hawkular-actions-sms/src/main/webapp/index.jsp
	hawkular-actions-snmp/src/main/webapp/index.jsp
	hawkular-actions-snmp/src/main/webapp/index.jsp~HEAD
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
	hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
	hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
	hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
	hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy
	hawkular-notifiers-email/src/main/webapp/index.jsp
	hawkular-notifiers-sms/src/main/webapp/index.jsp
	hawkular-notifiers-snmp/src/main/webapp/index.jsp

  Commit: 5af66b711ad4c5f6b09c388131c1e3f2a0446e90
      https://github.com/hawkular/hawkular-alerts/commit/5af66b711ad4c5f6b09c388131c1e3f2a0446e90
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy

  Log Message:
  -----------
  Allow generated IDs for rest-created Triggers

  Commit: bd3c385bce5a08009f8acf1dac7c67f151de2141
      https://github.com/hawkular/hawkular-alerts/commit/bd3c385bce5a08009f8acf1dac7c67f151de2141
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Fix missing updateTrigger in REST endpoint

  Commit: 949bd666d3b1fc3d262305ba827a73f0aec3b99a
      https://github.com/hawkular/hawkular-alerts/commit/949bd666d3b1fc3d262305ba827a73f0aec3b99a
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java

  Log Message:
  -----------
  Add condition should not check if exist

  Commit: afa2b9e4839a64150c3449d3cdefa3e06c783b93
      https://github.com/hawkular/hawkular-alerts/commit/afa2b9e4839a64150c3449d3cdefa3e06c783b93
  Author: Peter Palaga <ppalaga at redhat.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M hawkular-alerts-engine/pom.xml

  Log Message:
  -----------
  Instruct license plugin to ignore *.data files in hawkular-alerts-engine

  Commit: 680ecf2b04ef24d27c2aba5d1ff3838b460fe66b
      https://github.com/hawkular/hawkular-alerts/commit/680ecf2b04ef24d27c2aba5d1ff3838b460fe66b
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M hawkular-alerts-engine/pom.xml

  Log Message:
  -----------
  Merge pull request #28 from ppalaga/150318-wintermute-data

Instruct license plugin to ignore *.data files in hawkular-alerts-engine

  Commit: b605877d472f4effeb0464f4fdaf811dcb1b06ec
      https://github.com/hawkular/hawkular-alerts/commit/b605877d472f4effeb0464f4fdaf811dcb1b06ec
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    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/DbDefinitionsServiceImpl.java

  Log Message:
  -----------
  When adding tags, ignore duplicates.  This protects against issues adding
multiple conditions against the same dataId, and is simply more tolerant in
general.

  Commit: b9e2a07be8f2d200d39557e6d39d5f9e078cbcb2
      https://github.com/hawkular/hawkular-alerts/commit/b9e2a07be8f2d200d39557e6d39d5f9e078cbcb2
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M README.adoc
    R examples/example-alerts-ui/pom.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/jboss-web.xml
    R examples/example-alerts-ui/src/main/webapp/WEB-INF/web.xml
    R examples/example-alerts-ui/src/main/webapp/index.jsp
    A hawkular-actions-api/pom.xml
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/log/MsgLogger.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionMessage.java
    A hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionPluginMessage.java
    A hawkular-actions-email/pom.xml
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java
    A hawkular-actions-email/src/main/java/org/hawkular/actions/email/registration/RegistrationInit.java
    A hawkular-actions-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-email/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-email/src/main/webapp/index.jsp
    A hawkular-actions-sms/pom.xml
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/listener/SmsListener.java
    A hawkular-actions-sms/src/main/java/org/hawkular/actions/sms/registration/RegistrationInit.java
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-sms/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-sms/src/main/webapp/index.jsp
    A hawkular-actions-snmp/pom.xml
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/listener/SnmpListener.java
    A hawkular-actions-snmp/src/main/java/org/hawkular/actions/snmp/registration/RegistrationInit.java
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-actions-snmp/src/main/webapp/WEB-INF/web.xml
    A hawkular-actions-snmp/src/main/webapp/index.jsp
    M hawkular-alerts-api/pom.xml
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/notification/Notification.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java
    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/model/trigger/TriggerTemplate.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionListener.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionsService.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotificationsService.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/NotifierListener.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/AlertEngineRegister.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginListener.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/NotifierTypeListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/NotificationSender.java
    M hawkular-alerts-ear/pom.xml
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/BasicAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/GsonAdapter.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemActionsServiceImpl.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemNotificationsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    A hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening.data
    R hawkular-alerts-engine/src/main/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
    A hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening.data
    R hawkular-alerts-engine/src/test/resources/hawkular-alerts/notifiers.data
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data
    M hawkular-alerts-rest/pom.xml
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotificationHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifierTypeHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/NotifiersHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdConditionsHandler.java
    R hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AbstractTestBase.groovy
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ActionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AlertsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/AvailabilityConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/CompareConditionsTest.groovy
    A hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/FlowUITest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/NotifiersTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/StringConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdConditionsTest.groovy
    R hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/ThresholdRangeConditionsTest.groovy
    M hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/TriggersTest.groovy
    R hawkular-notifiers-api/pom.xml
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/log/MsgLogger.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotificationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierRegistrationMessage.java
    R hawkular-notifiers-api/src/main/java/org/hawkular/notifiers/api/model/NotifierTypeRegistrationMessage.java
    R hawkular-notifiers-email/pom.xml
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/notifications/EmailListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegisterListener.java
    R hawkular-notifiers-email/src/main/java/org/hawkular/notifiers/email/registration/RegistrationInit.java
    R hawkular-notifiers-email/src/main/test/org/hawkular/notifiers/email/notifications/EmailListenerTest.java
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-email/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-email/src/main/webapp/index.jsp
    R hawkular-notifiers-sms/pom.xml
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/notifications/SmsListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegisterListener.java
    R hawkular-notifiers-sms/src/main/java/org/hawkular/notifiers/sms/registration/RegistrationInit.java
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-sms/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-sms/src/main/webapp/index.jsp
    R hawkular-notifiers-snmp/pom.xml
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/notifications/SnmpListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegisterListener.java
    R hawkular-notifiers-snmp/src/main/java/org/hawkular/notifiers/snmp/registration/RegistrationInit.java
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/jboss-web.xml
    R hawkular-notifiers-snmp/src/main/webapp/WEB-INF/web.xml
    R hawkular-notifiers-snmp/src/main/webapp/index.jsp
    M pom.xml

  Log Message:
  -----------
  Merge branch 'wintermute'

Conflicts:
	examples/example-alerts-ui/pom.xml
	hawkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java
	hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/NotificationSender.java

Compare: https://github.com/hawkular/hawkular-alerts/compare/3624cc09bf87...b9e2a07be8f2