Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: f9bb4769a439df929507022d8d295a9e162805f7 https://github.com/hawkular/hawkular-metrics/commit/f9bb4769a439df9295070... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/LockManager.java M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java M job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobExecutionTest.java M job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobSchedulerTest.java M job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobSchedulingTest.java Log Message: ----------- [HWKMETRICS-451] add retry logic and fix conditional updates for acquiring locks Commit: 8c5c3ed4b6c85a22ea226dac3f08db6b92aa6b21 https://github.com/hawkular/hawkular-metrics/commit/8c5c3ed4b6c85a22ea226... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java M job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobExecutionTest.java Log Message: ----------- [HWMETRICS-451] fix merge conflicts Commit: 12ffbc221cb50aca3d48b7ba766b52bc0f7ec795 https://github.com/hawkular/hawkular-metrics/commit/12ffbc221cb50aca3d48b... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2016-08-02 (Tue, 02 Aug 2016) Changed paths: M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/LockManager.java M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java M job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobExecutionTest.java M job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobSchedulerTest.java M job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobSchedulingTest.java Log Message: ----------- Merge pull request #562 from jsanda/hwkmetrics-451 [HWKMETRICS-451] add retry logic and fix CQLfor acquiring locks Compare: https://github.com/hawkular/hawkular-metrics/compare/61504709f1ff...12ffb...