[Hawkular-commits] [hawkular/hawkular-metrics] 4e5c3f: more merge conflict clean up
Branch: refs/heads/rx-migration
Home: https://github.com/hawkular/hawkular-metrics
Commit: 4e5c3f151a612f642530341f166d49117d80f7b2
https://github.com/hawkular/hawkular-metrics/commit/4e5c3f151a612f6425303...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2015-05-18 (Mon, 18 May 2015)
Changed paths:
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
Log Message:
-----------
more merge conflict clean up