Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: 00935c1fae2aae147b57364d2960963c68fdc50f https://github.com/rhq-project/rhq/commit/00935c1fae2aae147b57364d2960963... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-01-07 (Thu, 07 Jan 2016) Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementBaseline.java Log Message: ----------- Never use a lazy loaded variable in toString() impl. This blew up in DEBUG mode if the MeasurementBaseline was not a managed entity. Commit: edd42cafc4adc030f82bff12d82b28f4d1beedbc https://github.com/rhq-project/rhq/commit/edd42cafc4adc030f82bff12d82b28f... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2016-01-07 (Thu, 07 Jan 2016) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java Log Message: ----------- [BZ 1292948] update fix to be Java 1.6 compatible Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java Compare: https://github.com/rhq-project/rhq/compare/52396e69b4f9...edd42cafc4ad