Branch: refs/heads/HWKMETRICS-326 Home: https://github.com/hawkular/hawkular-metrics Commit: 9e5c0de1afa6bd45873e9d85ad0340339b1ed02e https://github.com/hawkular/hawkular-metrics/commit/9e5c0de1afa6bd45873e9... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2015-11-25 (Wed, 25 Nov 2015) Changed paths: M api/diff.txt M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java M api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/observer/MetricCreatedObserver.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/JacksonConfig.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricDefinition.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricType.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricTypeFilter.java M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MixedMetricsRequest.java M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java 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 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/MetricsServiceITest.java M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/RatesITest.java M hawkular-component/src/main/java/org/hawkular/metrics/component/publish/AvailDataPublisher.java M hawkular-component/src/main/java/org/hawkular/metrics/component/publish/InsertedDataSubscriber.java M hawkular-component/src/main/java/org/hawkular/metrics/component/publish/MetricDataPublisher.java Log Message: ----------- [HWKMETRICS-326] Merge MetricDefintion functionality into Metric and remove it. There is only one class that represents a metric across all the API requests.