Branch: refs/heads/burmanm/4.13.1 Home: https://github.com/rhq-project/rhq Commit: 80b6d4ff53d2e51456abe4e429d2d8ca87f0381b https://github.com/rhq-project/rhq/commit/80b6d4ff53d2e51456abe4e429d2d8ca87... Author: Michael Burman yak@iki.fi Date: 2014-12-19 (Fri, 19 Dec 2014)

Changed paths: M modules/enterprise/agent/src/etc/rhq-agent.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh

Log Message: ----------- Revert "Ensure that the server and agent scripts propagate SIGTERM in foreground..."

(cherry picked from commit e7dda682db9546961d370bed125186b867cd85b1)

Commit: b8387509d311fc97c6f5c0d8e64939de90dc5fab https://github.com/rhq-project/rhq/commit/b8387509d311fc97c6f5c0d8e64939de90... Author: Michael Burman miburman@redhat.com Date: 2014-12-19 (Fri, 19 Dec 2014)

Changed paths: M modules/enterprise/agent/src/etc/rhq-agent.sh

Log Message: ----------- [BZ 1172085] Start rhq-agent with exec to properly handle SIGTERM and allow console access

(cherry picked from commit e96dc0719de6d8790c626a6e525c1806a9ead060)

Commit: 067e9d11ba14169a5ee63f6101b39f9269c406ec https://github.com/rhq-project/rhq/commit/067e9d11ba14169a5ee63f6101b39f9269... Author: Michael Burman miburman@redhat.com Date: 2014-12-19 (Fri, 19 Dec 2014)

Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh

Log Message: ----------- Return veithen's rhq-server.sh part from #149

(cherry picked from commit d116e76c2768508d0188276668a5c48e7f857087)

Commit: d88e4fdac86565e874e102444e4367b9b1b13760 https://github.com/rhq-project/rhq/commit/d88e4fdac86565e874e102444e4367b9b1... Author: Michael Burman miburman@redhat.com Date: 2014-12-19 (Fri, 19 Dec 2014)

Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Console.java

Log Message: ----------- [BZ 1174139] Fix SIGTERM handling for rhqctl console & rhqctl script

(cherry picked from commit 9c79cdc6016559383b886f668c0bdaefa145bf41)

Commit: 984429979995f988c0975fcd9210a133499d984d https://github.com/rhq-project/rhq/commit/984429979995f988c0975fcd9210a13349... Author: Michael Burman miburman@redhat.com Date: 2014-12-19 (Fri, 19 Dec 2014)

Changed paths: M modules/enterprise/agent/src/etc/rhq-agent.sh

Log Message: ----------- Fix whitespace issues

(cherry picked from commit d5da6aee526110b813569ff2f38c952017e78dc2)

Commit: 6a4db38e09f5f5486e7bd3890ba46803c969ef67 https://github.com/rhq-project/rhq/commit/6a4db38e09f5f5486e7bd3890ba46803c9... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-12-19 (Fri, 19 Dec 2014)

Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java

Log Message: ----------- [1174841] UnsupportedOperationException on mergeInventoryReport() Avoid the use of Iterator.remove() because Resources coming from the Agent may be using a customized impl for Resource.childResources (like CopyOnWriteArraySet). The solution "lazily protects" because the problem scenario is rare (restype reported by agent is not present on the server) and we don't want to do any unnecessary work (like changing the Set impl in advance).

(cherry picked from commit 9c374100de109ffa2f759a16b96da5ec20dc8a9a)

Commit: 4b0c2c8a07c9a5d72c0acd4e6aab55bf9a233f12 https://github.com/rhq-project/rhq/commit/4b0c2c8a07c9a5d72c0acd4e6aab55bf9a... Author: Larry O'Leary loleary@redhat.com Date: 2014-12-19 (Fri, 19 Dec 2014)

Changed paths: M modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java

Log Message: ----------- BZ-1049009 - JBoss Remoting SSL transport fails due to stale connections

This is a bug in JBoss Remoting 2.2.2.SP8 and was identified in https://issues.jboss.org/browse/JBREM-1245. The fix from JBREM-1245 can not easily be ported to 2.2.2 due to the code basis being different.

To fix this without needing a new version of JBoss Remoting, the rawSend method has been updated to retry the request in the event that we receive an RMI exception wrapped around the SSLException. As this is only done on connection failure, the impact should be very low to normal operation of the comm layer. (cherry picked from commit 7160d4a1468f567654bea4ca60a625c3362a4492)

(cherry picked from commit 533a9ad74225fe952a1a553bf1c3588d98f35c06) (cherry picked from commit 9cf449a0450c041e4609b67c5f86da9a17ccad84)

Signed-off-by: John Mazzitelli mazz@redhat.com (cherry picked from commit e274df2f8e7e214e5a3e8f934930c420995b4581)

Compare: https://github.com/rhq-project/rhq/compare/80b6d4ff53d2%5E...4b0c2c8a07c9