[Hawkular-commits] [hawkular/hawkular-alerts] 0cdf0c: HWKALERTS-89 Normalize Incoming Data Format

Jay Shaughnessy jshaughn at redhat.com
Wed Nov 4 15:34:20 EST 2015


  Branch: refs/heads/master
  Home:   https://github.com/hawkular/hawkular-alerts
  Commit: 0cdf0cc261b7e792f4ca78f4a179f1916807a8c0
      https://github.com/hawkular/hawkular-alerts/commit/0cdf0cc261b7e792f4ca78f4a179f1916807a8c0
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    A hawkular-alerts-actions-plugins/.gitignore
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.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/CompareConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.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/ThresholdConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeConditionEval.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/MixedData.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertData.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertDataMessage.java
    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/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
    M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java
    M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java

  Log Message:
  -----------
  HWKALERTS-89 Normalize Incoming Data Format
- remove Availability, NumericData StringData and MixedData
- redefine Data to be used as the sole data format
  - let the ConditionEval impls deal with any conversion
  - provide convenience factory methods for when caller knows
    the data type he wants to provide.
  - Note, support for multi-value conditions (i.e. the 'values'
    field) is anticipated but not yet a reality.
- Make AvailabilityType a 1st class citizen
- Note: REST API CHANGE in sendData endpoint, but this is
  not [yet] used in Hawkular code outside of alerts.
- Update bus integration code (topic listeners) to use new
  mechanism


  Commit: b64ffc410a4efa13174209d6ac972c8d4d951ff1
      https://github.com/hawkular/hawkular-alerts/commit/b64ffc410a4efa13174209d6ac972c8d4d951ff1
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java

  Log Message:
  -----------
  Comment out the multi-value case until it's needed, and per
review feedback, when it's needed consider rolling the single-value case
into the multi-value case.


  Commit: 607c5806aad6eaeaf04d8e8111f8773115fb18a1
      https://github.com/hawkular/hawkular-alerts/commit/607c5806aad6eaeaf04d8e8111f8773115fb18a1
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-actions-plugins/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/paging/AlertComparator.java
    M 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-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
    M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy

  Log Message:
  -----------
  HWKALERTS-88 Better integrate Alert.trigger and remove redundancies
- remove Alert.triggerId and Alert.context.
  - redundant with Alert.trigger.id and Alert.trigger.context
- maintain some pass-thru convenience getters
- update constructors
- maintain Alert.severity
  - it is lighweight and may be modifiable (in the future)
  - still a candidate to be removed as redundant

Other:
- Fix a build issue, it seemed there was a dep issue in action-plugins


  Commit: 37467cc5a6002625ec7fbcf28b817a629cee9017
      https://github.com/hawkular/hawkular-alerts/commit/37467cc5a6002625ec7fbcf28b817a629cee9017
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/AbstractEvent.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java

  Log Message:
  -----------
  WIP


  Commit: 2e9a629f6f28fe128f382b248b907f1b66d5b4cf
      https://github.com/hawkular/hawkular-alerts/commit/2e9a629f6f28fe128f382b248b907f1b66d5b4cf
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/AbstractEvent.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Thin.java
    M 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-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java

  Log Message:
  -----------
  WIP - Possible Refactor For Alerts with Events
Amend #1 : review with Lucas
- merge AbstractEvent into [concrete] Event
- have Alert extend Event
- move severity back up to Alert
- add eventText to Event

For now, we won't have type/category as a separate field, nor will we have
a field for source/owner. Instead see how far we get with context (not
searchable) and tags (searchable)


  Commit: 34c469c26e68b1a4a67b92dbe212bb1c08bffb80
      https://github.com/hawkular/hawkular-alerts/commit/34c469c26e68b1a4a67b92dbe212bb1c08bffb80
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java

  Log Message:
  -----------
  Rebase on Origin Events and fix merge issues


  Commit: 38c2090a87ff36d9b46f2babe6ff0e1179547c67
      https://github.com/hawkular/hawkular-alerts/commit/38c2090a87ff36d9b46f2babe6ff0e1179547c67
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    R .travis.yml
    A .travis.yml.wakeup.hal.when.events.are.consolidated

  Log Message:
  -----------
  Switch off Travis CI temporarily for Events branch


  Commit: 53971417daeb70ac5837c225f24999d26a6f6b12
      https://github.com/hawkular/hawkular-alerts/commit/53971417daeb70ac5837c225f24999d26a6f6b12
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/pom.xml
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/log/MsgLogger.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/CompareCondition.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/ThresholdCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java

  Log Message:
  -----------
  Refactor logger dependencies on java API


  Commit: 73846ce78413f2042a58055b60a47366d765d294
      https://github.com/hawkular/hawkular-alerts/commit/73846ce78413f2042a58055b60a47366d765d294
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmGarbageCollectionEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmNonHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/MultipleAllJvmEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlAvailabilityEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebActiveSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerCurrentThreadsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerPendingRequestsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebExpiredSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRejectedSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRequestsResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/CommonData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/Severity.java
    M 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/condition/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/AlertComparator.java
    M 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/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    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/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java

  Log Message:
  -----------
  Move Alert into events package


  Commit: 63c544585f47c8ea4cba3c319aa6fec9f8999d1f
      https://github.com/hawkular/hawkular-alerts/commit/63c544585f47c8ea4cba3c319aa6fec9f8999d1f
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java

  Log Message:
  -----------
  HWKALERTS-89 Normalize Incoming Data Format
- remove Availability, NumericData StringData and MixedData
- redefine Data to be used as the sole data format
  - let the ConditionEval impls deal with any conversion
  - provide convenience factory methods for when caller knows
    the data type he wants to provide.
  - Note, support for multi-value conditions (i.e. the 'values'
    field) is anticipated but not yet a reality.
- Make AvailabilityType a 1st class citizen
- Note: REST API CHANGE in sendData endpoint, but this is
  not [yet] used in Hawkular code outside of alerts.
- Update bus integration code (topic listeners) to use new
  mechanism


  Commit: 218458ddcb92f623484651918b8965c43603b154
      https://github.com/hawkular/hawkular-alerts/commit/218458ddcb92f623484651918b8965c43603b154
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java

  Log Message:
  -----------
  Move Alert into events package


  Commit: d3d3604ee587a6496e341335ab639ee68e8da5f2
      https://github.com/hawkular/hawkular-alerts/commit/d3d3604ee587a6496e341335ab639ee68e8da5f2
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    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/event/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventType.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/AlertsService.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl

  Log Message:
  -----------
  Playing with new Event impact on Trigger (API module mainly)
- Add eventType and eventText to trigger.
- Change rule engine to generate Alert or Event based on Trigger.
  note that an Alert gets a related Event automatically.
- new addEvents() service.
- Add tags to Events but note that I think we need to do work on
  Tags so they are more consistent across Triggers and Events.
  (See TODO in Event)
- Actions should probably be Event-level, not Alert-level


  Commit: 510980e1407858e0ab5db850617da13beeb8de97
      https://github.com/hawkular/hawkular-alerts/commit/510980e1407858e0ab5db850617da13beeb8de97
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java

  Log Message:
  -----------
  Change tags approach to name-value pair map


  Commit: 249d9997aae3ddb7b3092558ff6a82d6145df9e5
      https://github.com/hawkular/hawkular-alerts/commit/249d9997aae3ddb7b3092558ff6a82d6145df9e5
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    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/data/Data.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventType.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/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/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java

  Log Message:
  -----------
  Merge pull request #100 from jshaughn/jay-events

Playing with new Event impact on Trigger (API module mainly)


  Commit: c9e2e0d42f69f635cca2169a382ad78b4f77d03b
      https://github.com/hawkular/hawkular-alerts/commit/c9e2e0d42f69f635cca2169a382ad78b4f77d03b
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java

  Log Message:
  -----------
  HWKALERTS-89 Normalize Incoming Data Format
- remove Availability, NumericData StringData and MixedData
- redefine Data to be used as the sole data format
  - let the ConditionEval impls deal with any conversion
  - provide convenience factory methods for when caller knows
    the data type he wants to provide.
  - Note, support for multi-value conditions (i.e. the 'values'
    field) is anticipated but not yet a reality.
- Make AvailabilityType a 1st class citizen
- Note: REST API CHANGE in sendData endpoint, but this is
  not [yet] used in Hawkular code outside of alerts.
- Update bus integration code (topic listeners) to use new
  mechanism


  Commit: a44a12e77060c53b46a38597d17f36d9bf6484db
      https://github.com/hawkular/hawkular-alerts/commit/a44a12e77060c53b46a38597d17f36d9bf6484db
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java

  Log Message:
  -----------
  Move Alert into events package


  Commit: 43f6dcae64bf1bf10934182d53c1b074a13a0f9c
      https://github.com/hawkular/hawkular-alerts/commit/43f6dcae64bf1bf10934182d53c1b074a13a0f9c
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventConditionEval.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.java

  Log Message:
  -----------
  Add preliminar EventCondition support


  Commit: 83e57db42bdf6ea47e6275e80bdcf0c4c3ada72a
      https://github.com/hawkular/hawkular-alerts/commit/83e57db42bdf6ea47e6275e80bdcf0c4c3ada72a
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.java

  Log Message:
  -----------
  More unit tests on EventCondition


  Commit: 06cf81dc2d4f28362a7b443998ec6e82d1803004
      https://github.com/hawkular/hawkular-alerts/commit/06cf81dc2d4f28362a7b443998ec6e82d1803004
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.java

  Log Message:
  -----------
  Last unit tests for EventCondition


  Commit: 3bf1119af39301ea233fefc5a69b3d064880ce34
      https://github.com/hawkular/hawkular-alerts/commit/3bf1119af39301ea233fefc5a69b3d064880ce34
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

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

  Log Message:
  -----------
  Introduce EventCondition.eventName paired with Event.name


  Commit: 4eebb6785bdb8c76793b96a1c4b4982f1ee30c5c
      https://github.com/hawkular/hawkular-alerts/commit/4eebb6785bdb8c76793b96a1c4b4982f1ee30c5c
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

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

  Log Message:
  -----------
  Merge branch 'Events' into Play-Events

Conflicts:
	hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
	hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
	hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
	hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java


  Commit: 83fca021dee26a1ad2e130d1145bc04ec2eb1179
      https://github.com/hawkular/hawkular-alerts/commit/83fca021dee26a1ad2e130d1145bc04ec2eb1179
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.java

  Log Message:
  -----------
  Merge pull request #103 from jshaughn/lponce/play-events

Lponce/play events


  Commit: 9f07777e66878574c06ff4be8f1671bd442fac38
      https://github.com/hawkular/hawkular-alerts/commit/9f07777e66878574c06ff4be8f1671bd442fac38
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventCategory.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventType.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/model/trigger/TriggerType.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    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/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java

  Log Message:
  -----------
  Events prototyping
- EventType -> TriggerType, makes more sense as it defines what the trigger produces when firing
  - Defaults to ALERT.  Curently, to set to EVENT you must call a setter.
  - Do we need a constructor option?
- Add an Event Category.
  - This is just a proposal but it seems to me that Event.text would likely be
    too free form for search. I think a category makese sense as
    a relatively small set of potential values to filter or sort
    Event search results.
- Change the tags impl and start persisting tags for Alerts and Events.
  - TODO: change alert fetch to properly use the new tag apporoach
- Added some initial persistence of Events
- fix some import order after rebases

Other:
- still considering whether an Alert should possibly embed
  an Event as opposed to Extending, and then have it implement
  some Event interface.


  Commit: 72002242ca1147e5c7285c4f9fa3af981c7e85e5
      https://github.com/hawkular/hawkular-alerts/commit/72002242ca1147e5c7285c4f9fa3af981c7e85e5
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java

  Log Message:
  -----------
  Fix more checkstyle rebase/merge issues


  Commit: 0a0a7d819d9f32e30573cac564ccb75258824845
      https://github.com/hawkular/hawkular-alerts/commit/0a0a7d819d9f32e30573cac564ccb75258824845
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsCriteria.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/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy

  Log Message:
  -----------
  Events: flesh out initial impl
- everything builds
  - most Events services not yet implemented
- existing tests pass
  - no major event-related tests written yet
- add deserialization logic to handle Alerts subclassing of Events
  - ?? Do we need something other than using Category=Alert?
- update alert criteria fetch to use explicit alert tags
  - no longer uses implicit trigger tags
  - simplify some logic by adding more AlertCriteria.hasXxxCriteria methods
- update actions to [minimally] deal with Events


  Commit: 23513eb1a6395752c76bd2307b29948427bb0b18
      https://github.com/hawkular/hawkular-alerts/commit/23513eb1a6395752c76bd2307b29948427bb0b18
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/EventComparator.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/EventsCriteria.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions-data.json
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions-data.json
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions-data.json
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json

  Log Message:
  -----------
  Events: Add Event Services
- Add/Delete/Get/GetViaCriteria
- Add some initial testing (passing), more to come


  Commit: 2694169d7996f3cac899d5f2d1203c96648ed879
      https://github.com/hawkular/hawkular-alerts/commit/2694169d7996f3cac899d5f2d1203c96648ed879
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/EventComparator.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java

  Log Message:
  -----------
  Events: Add Event paging test
- Fix up EventComparator


  Commit: 923abc222d9ae7ec3848ef3ca610f0afadf53da3
      https://github.com/hawkular/hawkular-alerts/commit/923abc222d9ae7ec3848ef3ca610f0afadf53da3
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventType.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerType.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsEvent.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/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
    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/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java
    A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/EventsITest.groovy
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java

  Log Message:
  -----------
  Events - REST support and other assorted goodies
- Add EventsHandler REST API
- Add Events REST API groovy ITest
- Fix up Json [de-]serialization
  - don't try an overload the use of the category field by using
    it for polymorphic serialization (i.e. via JsonTypeInfo annotation)
  - add explicit Event.eventType field to be used by FasterXml
    - note: an implicit field didn't work because we send serialized json
      out to clients via Rest, and the client (e.g. groovy) would
      try to deserialize the field.
- Let Trigger define an explicit eventCategory and eventText.
- Rename DefinitionsEvent.EventType to DefinitionsEvent.Type to
  remove some confusing naming.
-


  Commit: 508865965e804b5148861cc508ff689d5167f93d
      https://github.com/hawkular/hawkular-alerts/commit/508865965e804b5148861cc508ff689d5167f93d
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionMessage.java
    R hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionPlugin.java
    M hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionPluginListener.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionPluginSender.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionResponseMessage.java
    M hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/MsgLogger.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/Plugin.java
    R hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginMessage.java
    R hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginOperationMessage.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/Sender.java
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/ActionPlugins.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginListener.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginRegister.java
    A hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginSender.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/MsgLogger.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailTemplate.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmGarbageCollectionEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmNonHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/MultipleAllJvmEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlAvailabilityEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebActiveSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerCurrentThreadsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerPendingRequestsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebExpiredSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRejectedSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRequestsResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/java/org/hawkular/alerts/actions/snmp/SnmpPlugin.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/TestActionMessage.java
    R hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/TestPluginMessage.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/MsgLogger.java
    A hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionMessage.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java
    A hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginSender.java
    A hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionResponseMessage.java
    R hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandalonePluginMessage.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonUtil.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/ActionComparator.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionsCriteria.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/ActionsService.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    A hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusActionMessage.java
    A hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusActionResponseMessage.java
    R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginMessage.java
    R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginOperationMessage.java
    A hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusRegistrationMessage.java
    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/ActionPluginOperationListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginRegistrationListener.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/BusActionListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertDataMessage.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AvailDataMessage.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionPluginSender.java
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/StandaloneAlerts.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassActionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemActionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java
    A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java
    R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
    A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java
    M hawkular-alerts-rest-tests/pom.xml
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' into jay-events
- Merge in the Action History Work...

Conflicts:
	hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
	hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
	hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java


  Commit: 9f81477b7d37bccfc683640490353a37d795c2f8
      https://github.com/hawkular/hawkular-alerts/commit/9f81477b7d37bccfc683640490353a37d795c2f8
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M hawkular-alerts-actions-api/pom.xml
    M hawkular-alerts-actions-bus/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/resources/template.html.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/resources/template.plain.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/resources/template.html.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/resources/template.plain.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/CommonData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-actions-plugins/pom.xml
    M hawkular-alerts-actions-standalone/pom.xml
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/AlertComparator.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/TriggerComparator.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
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/TriggersCriteria.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-bus-api/pom.xml
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-metrics/pom.xml
    M hawkular-alerts-rest-tests/pom.xml
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
    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 pom.xml

  Log Message:
  -----------
  Merge branch 'master' into jay-events

- Fix a couple of issues with Note handling in AutoResolve and
  add default values as needed for ack|resolveAlerts.

Conflicts:
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
	hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
	hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
	hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
	hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java


  Commit: ec3b371ceb8aca287ab5c2161f8bc564af5d6290
      https://github.com/hawkular/hawkular-alerts/commit/ec3b371ceb8aca287ab5c2161f8bc564af5d6290
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M hawkular-alerts-actions-api/pom.xml
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionMessage.java
    R hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionPlugin.java
    M hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionPluginListener.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionPluginSender.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/ActionResponseMessage.java
    M hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/MsgLogger.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/Plugin.java
    R hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginMessage.java
    R hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginOperationMessage.java
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/Sender.java
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    M hawkular-alerts-actions-bus/pom.xml
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/ActionPlugins.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginListener.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginRegister.java
    A hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginSender.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/MsgLogger.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailTemplate.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/resources/template.html.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/resources/template.plain.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmGarbageCollectionEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmNonHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/MultipleAllJvmEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlAvailabilityEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebActiveSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerCurrentThreadsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerPendingRequestsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebExpiredSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRejectedSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRequestsResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/resources/template.html.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/resources/template.plain.default_en_US.ftl
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/java/org/hawkular/alerts/actions/snmp/SnmpPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/pom.xml
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/CommonData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/TestActionMessage.java
    R hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/TestPluginMessage.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-actions-plugins/pom.xml
    M hawkular-alerts-actions-standalone/pom.xml
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/MsgLogger.java
    A hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionMessage.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java
    A hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginSender.java
    A hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionResponseMessage.java
    R hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandalonePluginMessage.java
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonUtil.java
    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/event/Alert.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventCategory.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventType.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/ActionComparator.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/AlertComparator.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/EventComparator.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/TriggerComparator.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/ActionsCriteria.java
    M 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/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/DefinitionsEvent.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/EventsCriteria.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/TriggersCriteria.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-bus-api/pom.xml
    A hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusActionMessage.java
    A hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusActionResponseMessage.java
    R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginMessage.java
    R hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginOperationMessage.java
    A hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusRegistrationMessage.java
    M hawkular-alerts-bus/pom.xml
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/AlertEngineRegister.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginOperationListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/ActionPluginRegistrationListener.java
    A hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/BusActionListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/log/MsgLogger.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertDataMessage.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AvailDataMessage.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/MetricDataMessage.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionPluginSender.java
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/StandaloneAlerts.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassActionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    R hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/MemActionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/log/MsgLogger.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions-data.json
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl
    R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java
    A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java
    R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
    A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.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.json
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-metrics/pom.xml
    M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java
    M hawkular-alerts-rest-tests/pom.xml
    A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/EventsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions-data.json
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
    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
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #104 from jshaughn/jay-events

Jay events


  Commit: c515521860800c58c60627cc36145f735b4b457f
      https://github.com/hawkular/hawkular-alerts/commit/c515521860800c58c60627cc36145f735b4b457f
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/Global.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/ActionPlugins.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginListener.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/pom.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookApp.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookHandler.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookPlugin.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHooks.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/accounts/PersonaFilter.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp-standalone/WEB-INF/jboss-deployment-structure.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp-standalone/WEB-INF/jboss-web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp-standalone/WEB-INF/web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/test/java/org/hawkular/alerts/actions/webhook/WebHooksTest.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/test/resources/log4j.properties
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/test/resources/test-webhooks.json
    M hawkular-alerts-actions-plugins/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into WebHooks


  Commit: c1f4139a726870cb761556e709517f4e5c955e4c
      https://github.com/hawkular/hawkular-alerts/commit/c1f4139a726870cb761556e709517f4e5c955e4c
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    A hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/Global.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/ActionPlugins.java
    M hawkular-alerts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginListener.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/pom.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookApp.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookHandler.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookPlugin.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHooks.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/accounts/PersonaFilter.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp-standalone/WEB-INF/jboss-deployment-structure.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp-standalone/WEB-INF/jboss-web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp-standalone/WEB-INF/web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/web.xml
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/test/java/org/hawkular/alerts/actions/webhook/WebHooksTest.java
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/test/resources/log4j.properties
    A hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/test/resources/test-webhooks.json
    M hawkular-alerts-actions-plugins/pom.xml

  Log Message:
  -----------
  Merge pull request #116 from lucasponce/WebHooks

Web hooks


  Commit: 760c5884a2b27dd22fa2dae35678f96f0fe5e091
      https://github.com/hawkular/hawkular-alerts/commit/760c5884a2b27dd22fa2dae35678f96f0fe5e091
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    A .travis.yml
    R .travis.yml.wakeup.hal.when.events.are.consolidated

  Log Message:
  -----------
  Open the Pod bay doors, HAL


  Commit: d9c730550b865278d06c8f059baab6f61430410c
      https://github.com/hawkular/hawkular-alerts/commit/d9c730550b865278d06c8f059baab6f61430410c
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookPlugin.java

  Log Message:
  -----------
  Fix some issues due merge Events/master branch


  Commit: ef1a90677f42c66458fa59ab94bd40a5f66df666
      https://github.com/hawkular/hawkular-alerts/commit/ef1a90677f42c66458fa59ab94bd40a5f66df666
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-10-28 (Wed, 28 Oct 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  HWKALERTS-97 Upgrade drools to 6.3.0.Final


  Commit: 5de8cf2d60fc0d99cab10daebada2ad42a422af5
      https://github.com/hawkular/hawkular-alerts/commit/5de8cf2d60fc0d99cab10daebada2ad42a422af5
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    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/PersistenceTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java

  Log Message:
  -----------
  HWKALERTS-99 Add EventCondition into rules engine


  Commit: 4f7c3381644afd2cc526cb2581fd59ee1c8f6979
      https://github.com/hawkular/hawkular-alerts/commit/4f7c3381644afd2cc526cb2581fd59ee1c8f6979
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java

  Log Message:
  -----------
  HWKALERTS-99 Add Events unit tests


  Commit: cc8f388a70717bd7c1ed8a69b4ccbf7391a49a77
      https://github.com/hawkular/hawkular-alerts/commit/cc8f388a70717bd7c1ed8a69b4ccbf7391a49a77
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-02 (Mon, 02 Nov 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    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-99 Introduce resulting events/alerts as input events


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

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java

  Log Message:
  -----------
  HWKALERTS-99 Send events to the engine first


  Commit: 90e033bd5a4cb8b602adf058a161943012364e94
      https://github.com/hawkular/hawkular-alerts/commit/90e033bd5a4cb8b602adf058a161943012364e94
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/EventsCacheManager.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java
    M hawkular-alerts-engine/src/test/resources/log4j.xml
    M hawkular-alerts-engine/src/test/resources/simplelogger.properties
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/EventsITest.groovy
    M pom.xml

  Log Message:
  -----------
  HWKALERTS-99 Add Events filtering by active dataId
Fix rest profile for local end-to-end tests


  Commit: 29c6354a142b03d0b9f19144332e158cbcae89f0
      https://github.com/hawkular/hawkular-alerts/commit/29c6354a142b03d0b9f19144332e158cbcae89f0
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

  Changed paths:
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java

  Log Message:
  -----------
  HWKALERTS-100 Add Global plugin execution on standalone deployment


  Commit: b5b0fdef312320f56c9f5d43c3ead0c2cba8040b
      https://github.com/hawkular/hawkular-alerts/commit/b5b0fdef312320f56c9f5d43c3ead0c2cba8040b
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.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/EventConditionTest.java
    M hawkular-alerts-engine/pom.xml
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java

  Log Message:
  -----------
  HWKALERTS-99 Apply feedback comments


  Commit: 022506aceb499acf86c84b68be8cc735e65f71b4
      https://github.com/hawkular/hawkular-alerts/commit/022506aceb499acf86c84b68be8cc735e65f71b4
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java

  Log Message:
  -----------
  HWKALERTS-99 Unify addEvents() logic
Maintain persisEvents() for Java API


  Commit: e4c5075cfcb8d48589d4e4a04c6b2289b3593a33
      https://github.com/hawkular/hawkular-alerts/commit/e4c5075cfcb8d48589d4e4a04c6b2289b3593a33
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.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/EventConditionTest.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.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/EventsCacheManager.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java
    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/CassPersistenceTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/RulesEngineTest.java
    M hawkular-alerts-engine/src/test/resources/log4j.xml
    M hawkular-alerts-engine/src/test/resources/simplelogger.properties
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/EventsITest.groovy
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #118 from lucasponce/Events-HWKALERTS-99

EventsConditions


  Commit: 992c94aedf303852caf6fda9fd482880d892f590
      https://github.com/hawkular/hawkular-alerts/commit/992c94aedf303852caf6fda9fd482880d892f590
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    A hawkular-alerts-actions-plugins/.gitignore
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmGarbageCollectionEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmNonHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/MultipleAllJvmEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlAvailabilityEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebActiveSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerCurrentThreadsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerPendingRequestsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebExpiredSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRejectedSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRequestsResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/CommonData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookPlugin.java
    M hawkular-alerts-actions-plugins/pom.xml
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonUtil.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/log/MsgLogger.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/Severity.java
    M 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/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
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.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
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/MixedData.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Alert.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventCategory.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventType.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Thin.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/ActionComparator.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/AlertComparator.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/EventComparator.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/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/DefinitionsEvent.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/EventsCriteria.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertData.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertDataMessage.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassActionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/EventsCacheManager.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions-data.json
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
    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/CassPersistenceTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.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.json
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-engine/src/test/resources/log4j.xml
    M hawkular-alerts-engine/src/test/resources/simplelogger.properties
    M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java
    M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy
    A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/EventsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions-data.json
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java
    M pom.xml

  Log Message:
  -----------
  Merge branch 'Events' into copy-master


  Commit: 0afd981fce7112af2d701c68b0f309027f3498e7
      https://github.com/hawkular/hawkular-alerts/commit/0afd981fce7112af2d701c68b0f309027f3498e7
  Author: Lucas Ponce <ponce.ballesteros at gmail.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade accounts into 1.1.0.Final


  Commit: 2773f8af452e4f94f72d09b95fd1ec8c1b5f32eb
      https://github.com/hawkular/hawkular-alerts/commit/2773f8af452e4f94f72d09b95fd1ec8c1b5f32eb
  Author: Jay Shaughnessy <jshaughn at redhat.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M hawkular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
    A hawkular-alerts-actions-plugins/.gitignore
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmGarbageCollectionEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmNonHeapUsageEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/MultipleAllJvmEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlAvailabilityEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebActiveSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerCurrentThreadsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerPendingRequestsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebExpiredSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRejectedSessionsEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRequestsResponseTimeEmailTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/CommonData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java
    M hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookPlugin.java
    M hawkular-alerts-actions-plugins/pom.xml
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/ActionPlugins.java
    M hawkular-alerts-actions-standalone/src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginListener.java
    M hawkular-alerts-api/pom.xml
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JsonUtil.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/log/MsgLogger.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/Severity.java
    M 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/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
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/EventConditionEval.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalConditionEval.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
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Availability.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/MixedData.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/NumericData.java
    R hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/StringData.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Alert.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventCategory.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/EventType.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/event/Thin.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/ActionComparator.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/AlertComparator.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/EventComparator.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/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/DefinitionsEvent.java
    M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java
    A hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/EventsCriteria.java
    A hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/EventConditionTest.java
    M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/init/CacheManager.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/AvailDataListener.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/listener/MetricDataListener.java
    R hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertData.java
    M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/messages/AlertDataMessage.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassActionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassStatement.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
    A hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/EventsCacheManager.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/rules/RulesEngine.java
    M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/service/AlertsEngine.java
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions-data.json
    M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers-data.json
    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/CassPersistenceTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PerfRulesEngineTest.java
    M hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/PersistenceTest.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.json
    M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers-data.json
    M hawkular-alerts-engine/src/test/resources/log4j.xml
    M hawkular-alerts-engine/src/test/resources/simplelogger.properties
    M hawkular-alerts-metrics/src/main/java/org/hawkular/alerts/external/metrics/Manager.java
    M hawkular-alerts-metrics/src/test/groovy/org/hawkular/alerts/external/ExternalMetricsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy
    A hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/EventsITest.groovy
    M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions-data.json
    M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers-data.json
    M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java
    A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/EventsHandler.java
    M pom.xml

  Log Message:
  -----------
  Merge pull request #119 from lucasponce/copy-master

Sync master with Events branch


Compare: https://github.com/hawkular/hawkular-alerts/compare/46aa5bb23098...2773f8af452e


More information about the hawkular-commits mailing list