Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: 2031410a1a59cf8429bfd754d03cea1a57420af9 https://github.com/hawkular/hawkular-alerts/commit/2031410a1a59cf8429bfd7... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-11-01 (Tue, 01 Nov 2016) Changed paths: 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/DataDrivenGroupCacheManager.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/impl/PartitionManagerImpl.java Log Message: ----------- - Improvements to DataDrivenGroupCacheManager and PartitionManagerImpl - increase timeout when updating cache/changing topology so that waiting calls don't timeout. - apply READ locks where possible, to reduce waiting - Synchronization fix. Method level synchronization syncs on 'this' but we need to consistently sync on pendingData/pendingEvents. - make sure we include tenant when comparing Data objects. Commit: 48b47717d6371249b9b4b4b5619d41092e8ccbb6 https://github.com/hawkular/hawkular-alerts/commit/48b47717d6371249b9b4b4... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-11-02 (Wed, 02 Nov 2016) Changed paths: 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/DataDrivenGroupCacheManager.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/impl/PartitionManagerImpl.java Log Message: ----------- Merge pull request #247 from jshaughn/master-fixes Master fixes Compare: https://github.com/hawkular/hawkular-alerts/compare/7364625e692e...48b477...