Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: b1b4eeef1682f6a15a31e2103969236b8783b2e8 https://github.com/rhq-project/rhq/commit/b1b4eeef1682f6a15a31e2103969236... Author: John Sanda <jsanda(a)redhat.com&gt; Date: 2014-05-30 (Fri, 30 May 2014) Changed paths: M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java Log Message: ----------- [BZ 1015706,1092756] check for invalid max and update it with the avg We also log a warning to indicate that we have come across an invalid metric. We then update and persist the max. Conflicts: modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java