[Hawkular-commits] [hawkular/hawkular-metrics] 485730: Merge branch 'next' of github.com:hawkular/hawkula...

[Stefan Negrea]

  Branch: refs/heads/HWKMETRICS-721
  Home:   https://github.com/hawkular/hawkular-metrics
  Commit: 48573068d9425154e74cc32622cf110adea6c490
      https://github.com/hawkular/hawkular-metrics/commit/48573068d9425154e74cc32622cf110adea6c490
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/DataAccess.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/DataAccessImpl.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java
    M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/DelegatingDataAccess.java

  Log Message:
  -----------
  Merge branch 'next' of github.com:hawkular/hawkular-metrics into next

# Conflicts:
#	api/metrics-api-jaxrs/pom.xml
#	api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/MetricsApp.java
#	api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/ServiceModule.java
#	api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/filter/TenantFilter.java
#	api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/handler/PingHandler.java
#	api/metrics-api-jaxrs/src/main/resources/hawkular.properties
#	pom.xml