Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: fcdf3cd616953c6bf2ea094016ae671c2facd7d7 https://github.com/hawkular/hawkular-alerts/commit/fcdf3cd616953c6bf2ea09... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: 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 Log Message: ----------- HWKALERTS-203 Fix issue in Event.compareTo - add in tenantId and dataSource, otherwise we may defer an event that should have been sent to the engine. - also: change natural ordering of Alert to be analogous to Event. This is a micro-optimization, Because Data.id is more discriminating that tenantId or source, there will be less String matching when sorting. Commit: 79e4b1401deb3fee1cdf270a37194082482c3b8c https://github.com/hawkular/hawkular-alerts/commit/79e4b1401deb3fee1cdf27... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: 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 Log Message: ----------- Merge pull request #263 from jshaughn/hwkalerts-203 HWKALERTS-203 Fix issue in Event.compareTo Compare: https://github.com/hawkular/hawkular-alerts/compare/c2caf4706bda...79e4b1...