Branch: refs/heads/rc/jon3.2.2.DR3
Home:
https://github.com/rhq-project/rhq
Commit: 92e6302c4f6e9dd391773819098d6df01d775f8b
https://github.com/rhq-project/rhq/commit/92e6302c4f6e9dd391773819098d6df...
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java
M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/Version.java
M
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/Version.java
M
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java
M
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java
Log Message:
-----------
[BZ 1084890] modify CLI and Agent text to reflect update information if available.
Commit: c8012c07c12f321576ca7633aaf026bbf4f23ec3
https://github.com/rhq-project/rhq/commit/c8012c07c12f321576ca7633aaf026b...
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml
M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml
M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml
M
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml
Log Message:
-----------
[BZ 1081592] - Attempt to deploy a package to the resource from the
repository gives error
This is a combination of 2 commits that were squashed toghether:
* [BZ 1099485] Fix JSF file upload popup for all upload locations
(cherry picked from commit 76f9e174ed62be4742f35a91bd3e9aa02934a81e)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
* [BZ 1078510] - Make sure to use the "plain" pagination on "plain"
jsf pages
This avoids the warning arising from the "non-plain" pagination trying to
access page elements not present on the plain pages.
(cherry picked from commit 3150c41379c2530a4ab50fd216fa891c0d78553d)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Commit: 873e770303db5ab622511fe17be1fce53e06a13b
https://github.com/rhq-project/rhq/commit/873e770303db5ab622511fe17be1fce...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-06-26 (Thu, 26 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
Commit: f08ed59aa4e1143e32d2d0de50d84d575d0eca56
https://github.com/rhq-project/rhq/commit/f08ed59aa4e1143e32d2d0de50d84d5...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M modules/enterprise/server/server-metrics/pom.xml
M pom.xml
Log Message:
-----------
[BZ 1092799] upgrade netty version used by datastax driver
Commit: 50bd9f76b281d27e8b027fc9cdd07a213ba05594
https://github.com/rhq-project/rhq/commit/50bd9f76b281d27e8b027fc9cdd07a2...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
Log Message:
-----------
[BZ 1092799] upgrade netty version used by Cassandra
Commit: 44428f72fb1c8356cb59f6bc7b1e7484f7278a03
https://github.com/rhq-project/rhq/commit/44428f72fb1c8356cb59f6bc7b1e748...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
Log Message:
-----------
[BZ 1105743] - Viewing operation details for operations with no results causes Globally
uncaught exception in UI - java.lang.IllegalArgumentException:Null configuration.
- BZ 1103375 for RHQ
- Handled cases where null results are returned from an operation excecution.
- Fixed one op history update path where [results] data could be lost.
(cherry picked from commit ed8a2c4ce29920559febbd23129db6d9afa77d99)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentDetailView.java
Compare:
https://github.com/rhq-project/rhq/compare/9a687c19dcea...44428f72fb1c