[Hawkular-commits] [hawkular/hawkular-metrics] 475420: Port changes from PR#220 to rx-migration branch

[Thomas Segismont]

  Branch: refs/heads/rx-migration
  Home:   https://github.com/hawkular/hawkular-metrics
  Commit: 47542062ba0cc8a55d3906f41143d9aefc147ee1
      https://github.com/hawkular/hawkular-metrics/commit/47542062ba0cc8a55d3906f41143d9aefc147ee1
  Author: Thomas Segismont <tsegismo at redhat.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/antlr4/org/hawkular/metrics/api/jaxrs/influx/query/parse/InfluxQuery.g4
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxObject.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/influx/query/parse/definition/SelectQueryDefinitionsParser.java
    M api/metrics-api-jaxrs/src/test/resources/influx/query/supported-select-queries.iql
    M api/metrics-api-jaxrs/src/test/resources/influx/query/syntactically-correct-queries.iql
    M clients/ptranslator/log4j-dev.xml
    M rest-tests/src/test/groovy/org/hawkular/metrics/rest/InfluxITest.groovy
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDBTest.java
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDatabaseITest.java

  Log Message:
  -----------
  Port changes from PR#220 to rx-migration branch


  Commit: 36467c804623ab1f2c4aafb99371a917c7511a3e
      https://github.com/hawkular/hawkular-metrics/commit/36467c804623ab1f2c4aafb99371a917c7511a3e
  Author: Thomas Segismont <tsegismont at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/antlr4/org/hawkular/metrics/api/jaxrs/influx/query/parse/InfluxQuery.g4
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxObject.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/influx/query/parse/definition/SelectQueryDefinitionsParser.java
    M api/metrics-api-jaxrs/src/test/resources/influx/query/supported-select-queries.iql
    M api/metrics-api-jaxrs/src/test/resources/influx/query/syntactically-correct-queries.iql
    M clients/ptranslator/log4j-dev.xml
    M rest-tests/src/test/groovy/org/hawkular/metrics/rest/InfluxITest.groovy
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDBTest.java
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDatabaseITest.java

  Log Message:
  -----------
  Merge pull request #221 from tsegismont/grafana_testing_rx-migration

Merging now that PR #220 has been merged into master.


Compare: https://github.com/hawkular/hawkular-metrics/compare/7e360934d0c0...36467c804623