Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: c3b9a237403afa066bcf13cfa24bdff323e65404
https://github.com/rhq-project/rhq/commit/c3b9a237403afa066bcf13cfa24bdff32…
Author: Libor Zoubek <lzoubek(a)redhat.com>
Date: 2015-04-29 (Wed, 29 Apr 2015)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
Log Message:
-----------
Bug 1211407 - Agent plug-in deletion fails if resource group or auto-group
operation was used
Whenever Compatible group transforms to mixed group (ie. becomes empty) we
now delete GroupOperationHistory rows, but keep ResourceOperationHistory.
This fixes Bug 1211407, because agent plug-in deletion means resourceType
deletion, which means resource deletion, which means removing resources from
groups - removing resource of same resourceType from group makes it empty =>
mixed. This is when this fix comes to play.
Branch: refs/heads/hotfix/jon3.1.2
Home: https://github.com/rhq-project/rhq
Commit: dacab80cb014a34a23ad32a61643fbe26b4fa5dc
https://github.com/rhq-project/rhq/commit/dacab80cb014a34a23ad32a61643fbe26…
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
Incorrect copyright date introduced by commit f2dc897
Corrected copyright start date. This class was not introduced until
2011.
Commit: 0226e3c1164a696da127ba7a1eaf4d80c013216c
https://github.com/rhq-project/rhq/commit/0226e3c1164a696da127ba7a1eaf4d80c…
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
BZ-1203469: Fail to manually import JBoss EAP based products when product slot is unknown
If a JBoss EAP 6/AS 7 instance does not include a bin/product.conf file,
it is assumed to be an AS 7 instance. However, if it does include a
product.conf file but the slot value is unknown by the as-7 plug-in, an
attempt is made to determine its type from its home directory name. If
this does not work, discovery is aborted and the JBoss EAP 6 / AS 7
instance can not be imported into inventory.
Even when an AS7 resource is manually added, this same problem occurs.
This fix allows a manual import to be successful even if the product
type can not be determined. A warning is now logged to identify that an
unsupported product was found and the product type falls back to AS.
Commit: 29b503b5cfd3f9a99c1a8c10bac23b1c272bd0af
https://github.com/rhq-project/rhq/commit/29b503b5cfd3f9a99c1a8c10bac23b1c2…
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
BZ-1203469: Fail to auto discover EAP based products when product slot is unknown
If a JBoss EAP 6/AS 7 instance does not include a bin/product.conf file,
it is assumed to be an AS 7 instance. However, if it does include a
product.conf file but the slot value is unknown by the as-7 plug-in, an
attempt is made to determine its type from its home directory name. If
this does not work, discovery is aborted and the JBoss EAP 6 / AS 7
instance can not be imported into inventory.
This fix allows the product type to fallback to a generic AS instance in
the event its product slot is unknown and a the home directory name does
not include a product key in its name.
Commit: 03caa627cba0c0b09454b3fd89f5bdd08490aff5
https://github.com/rhq-project/rhq/commit/03caa627cba0c0b09454b3fd89f5bdd08…
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
Merge branch 'RHQ_4_4_0_JON312GA/bug/1203469' into hotfix/jon3.1.2
This allows AS7 based products to be discovered as AS instances in the event they are for unknown or unsupported product slots.
Compare: https://github.com/rhq-project/rhq/compare/dbab1189aba8...03caa627cba0
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: b1708d2110d96926290a4ab3ceab201b4a476d92
https://github.com/rhq-project/rhq/commit/b1708d2110d96926290a4ab3ceab201b4…
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2015-04-28 (Tue, 28 Apr 2015)
Changed paths:
M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh
M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh
M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh
M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh
M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
M publish.sh
M release.sh
Log Message:
-----------
Removing the permgen JVM options for JDK 8 and higher (Linux part). The warning will still be there on Windows.
Branch: refs/heads/release/jon3.1.x
Home: https://github.com/rhq-project/rhq
Commit: 0b4745e8a6c48943fcb821c5cd557bc7f03678bd
https://github.com/rhq-project/rhq/commit/0b4745e8a6c48943fcb821c5cd557bc7f…
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
Incorrect copyright date introduced by commit f2dc897
Corrected copyright start date. This class was not introduced until
2011.
(cherry picked from commit dacab80cb014a34a23ad32a61643fbe26b4fa5dc)
Commit: 5bcfe335ca257bcc142d9ac74103e1b5f911b61e
https://github.com/rhq-project/rhq/commit/5bcfe335ca257bcc142d9ac74103e1b5f…
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
BZ-1203469: Fail to manually import JBoss EAP based products when product slot is unknown
If a JBoss EAP 6/AS 7 instance does not include a bin/product.conf file,
it is assumed to be an AS 7 instance. However, if it does include a
product.conf file but the slot value is unknown by the as-7 plug-in, an
attempt is made to determine its type from its home directory name. If
this does not work, discovery is aborted and the JBoss EAP 6 / AS 7
instance can not be imported into inventory.
Even when an AS7 resource is manually added, this same problem occurs.
This fix allows a manual import to be successful even if the product
type can not be determined. A warning is now logged to identify that an
unsupported product was found and the product type falls back to AS.
(cherry picked from commit 0226e3c1164a696da127ba7a1eaf4d80c013216c)
Commit: 0a9a4eee63ca268da106bd6d20b1c0dc4252e645
https://github.com/rhq-project/rhq/commit/0a9a4eee63ca268da106bd6d20b1c0dc4…
Author: Larry O'Leary <loleary(a)redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
Log Message:
-----------
BZ-1203469: Fail to auto discover EAP based products when product slot is unknown
If a JBoss EAP 6/AS 7 instance does not include a bin/product.conf file,
it is assumed to be an AS 7 instance. However, if it does include a
product.conf file but the slot value is unknown by the as-7 plug-in, an
attempt is made to determine its type from its home directory name. If
this does not work, discovery is aborted and the JBoss EAP 6 / AS 7
instance can not be imported into inventory.
This fix allows the product type to fallback to a generic AS instance in
the event its product slot is unknown and a the home directory name does
not include a product key in its name.
(cherry picked from commit 29b503b5cfd3f9a99c1a8c10bac23b1c272bd0af)
Compare: https://github.com/rhq-project/rhq/compare/3e6ed2afe17b...0a9a4eee63ca