Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: 9ae3875a38f4b70bb3ecf04413c81a87609fb2dc https://github.com/rhq-project/rhq/commit/9ae3875a38f4b70bb3ecf04413c81a8760... Author: John Mazzitelli mazz@redhat.com Date: 2015-01-15 (Thu, 15 Jan 2015)
Changed paths: M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java M modules/enterprise/agent/src/main/resources/agent-configuration.xml M modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentConfigurationTest.java M modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainerConfiguration.java M modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainerConfigurationConstants.java A modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/ServiceContainerConfigurationTest.java M modules/enterprise/server/jar/src/main/resources/server-comm-configuration.xml
Log Message: ----------- BZ 1166383 - ensure a transport param is added to the remoting locator URL
(cherry picked from commit 2a2ffa4dc443f0064365e7ef56deee4b9e3c688d)
Conflicts: modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentConfigurationTest.java