[Hawkular-commits] [hawkular/hawkular-metrics] 369915: Fix a botched rebase.

Branch: refs/heads/restremake Home: https://github.com/hawkular/hawkular-metrics Commit: 369915e229bd72c35e5c7b031d7e071cf3cc483e https://github.com/hawkular/hawkular-metrics/commit/369915e229bd72c35e5c7... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2015-04-10 (Fri, 10 Apr 2015) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java M rest-tests/src/test/java/org/hawkular/metrics/test/ErrorsITest.java Log Message: ----------- Fix a botched rebase. Commit: add843abd166ae78361474817d449077f75631e8 https://github.com/hawkular/hawkular-metrics/commit/add843abd166ae7836147... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2015-04-13 (Mon, 13 Apr 2015) Changed paths: M api/metrics-api-jaxrs/README.adoc A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/AvailabilityHandler.java A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/CounterHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricHandler.java M rest-tests/src/test/groovy/org/hawkular/metrics/rest/AvailabilityMetricStatisticsITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TagsITest.groovy Log Message: ----------- Split availability and counter end-points to separate handler files. Commit: 439810905233a67c09a2ae32449602b2085bcb74 https://github.com/hawkular/hawkular-metrics/commit/439810905233a67c09a2a... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2015-04-13 (Mon, 13 Apr 2015) Changed paths: R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/JacksonConfig.java A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/JacksonConfig.java Log Message: ----------- Move Jackson config class to a better package. Compare: https://github.com/hawkular/hawkular-metrics/compare/635569d71f53...43981...