Branch: refs/heads/release/jon3.2.x
Home:
https://github.com/rhq-project/rhq
Commit: 4da191bd8835c8230c8e7c0fb152a82e3be0c147
https://github.com/rhq-project/rhq/commit/4da191bd8835c8230c8e7c0fb152a82...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/AbstractMetricGraph.java
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/CustomDateRangeState.java
A
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsGridFieldName.java
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/preferences/MeasurementUserPreferences.java
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
M
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
Log Message:
-----------
[BZ 1096902] - "Maximum" and "Minimum" values do not match the graph
values - fixing a race condition in CustomDateRangeState
(cherry picked from commit 71b927358b997627375703a3510a2f03bbfb0c3c)
Signed-off-by: Mike Thompson <mithomps(a)redhat.com>
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java
A
../../../modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsGridFieldName.java
M
../../../modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java
M
../../../modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
M
../../../modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties