Branch: refs/heads/counter-rates Home: https://github.com/hawkular/hawkular-metrics Commit: f53b8b0fb68179ac5439b42e7764dbe3701a65dc https://github.com/hawkular/hawkular-metrics/commit/f53b8b0fb68179ac5439b... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java Log Message: ----------- [HWKMETRIC-207] clean up MetricsServiceImpl.createTenant method Commit: a9b2639874dce142f5b9e8860bb01c4dc9708e76 https://github.com/hawkular/hawkular-metrics/commit/a9b2639874dce142f5b9e... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GenerateRate.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java A core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java Log Message: ----------- [HWKMETRICS-200] initial support for calculating rates per tenant Commit: 7eea862012a195e6627d37e754a8d0ce72cd613c https://github.com/hawkular/hawkular-metrics/commit/7eea862012a195e6627d3... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java Log Message: ----------- [HWKMETRICS-200] fix merge conflicts Commit: 66ddafb4236b2ae758b1b38cb9459944df911c49 https://github.com/hawkular/hawkular-metrics/commit/66ddafb4236b2ae758b1b... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy Log Message: ----------- [HWKMETRICS-200] fix REST API test for counter rates Now that the rates job is scheduled per tenant during tenant creation, the test needs to explicitly create the tenant. I also updated the createTenant method to concat the observable returned from scheduling the task with the index updates. This way the subscriber will be notified if any of the updates, along with scheduling the rates task, fails. Commit: ae0a2787365515f3173d020f9ed0c7442eea39d9 https://github.com/hawkular/hawkular-metrics/commit/ae0a2787365515f3173d0... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GenerateRate.java Log Message: ----------- [HWKMETRICS-200] add some comments Commit: 7a0a45ad7ee9f2a00ccc7c86268b190045e115e1 https://github.com/hawkular/hawkular-metrics/commit/7a0a45ad7ee9f2a00ccc7... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2015-08-17 (Mon, 17 Aug 2015) Changed paths: M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/GenerateRateITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java Log Message: ----------- [HWKMETRICS-200] fix merge errors after rebase Compare: https://github.com/hawkular/hawkular-metrics/compare/807e094d4afc...7a0a4...