Branch: refs/heads/release/jon3.2.x
Home:
https://github.com/rhq-project/rhq
Commit: e616a4f882220666f1c5f0d43e9e78a7f1a8d151
https://github.com/rhq-project/rhq/commit/e616a4f882220666f1c5f0d43e9e78a...
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: 2014-07-29 (Tue, 29 Jul 2014)
Changed paths:
M
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebConnectorComponent.java
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[BZ 1095000] Don't try to guess web connector's max connections.
(cherry picked from commit ff200f352243cae35993485062844c0d3a17e09c)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Commit: a9afdba0c39baaf4e7744cb9f6731a5d7b8b9dd4
https://github.com/rhq-project/rhq/commit/a9afdba0c39baaf4e7744cb9f6731a5...
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: 2014-07-29 (Tue, 29 Jul 2014)
Changed paths:
M
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java
R
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java
Log Message:
-----------
[BZ 1095000] Fix test failures.
(cherry picked from commit 735365ddbf20409003e7ede9f47d4489a0f6c41a)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Conflicts:
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/WebConnectorComponentTest.java
Note: the conflicts were caused only due to different formatting
Compare:
https://github.com/rhq-project/rhq/compare/8bda5077f896...a9afdba0c39b