Branch: refs/heads/release/jon3.2.x Home: https://github.com/rhq-project/rhq Commit: 8e2d5ae9b993363e6ccf7ea4874515ae7a1fb1ec https://github.com/rhq-project/rhq/commit/8e2d5ae9b993363e6ccf7ea4874515ae7a... Author: John Mazzitelli mazz@redhat.com Date: 2014-08-07 (Thu, 07 Aug 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/report/measurement/MeasurementOOBDataSource.java
Log Message: ----------- Regarding the conflict, as per Jay S: "Just accept the non-HEAD segment."
[BZ 1113707] Allow sorting resourceName, scheduleName, timestamp and oobFactor on the server-side, rest on the client side only (cherry picked from commit 3fa0ecba6a45986efbd1e63afff1f6ce54612763)
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/report/measurement/MeasurementOOBDataSource.java