Branch: refs/heads/rc/jon3.3.0.ER04 Home: https://github.com/rhq-project/rhq Commit: 160e6ee01bc9685f72bf73b20588befa5792616a https://github.com/rhq-project/rhq/commit/160e6ee01bc9685f72bf73b20588bef... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-09-29 (Mon, 29 Sep 2014) Changed paths: M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java Log Message: ----------- [BZ 1070262] Obfuscate properties in agent-configuration.xml when the file originates from older agents. (cherry picked from commit 67f780ae17aa76164006a1af405cb12382952822) Signed-off-by: John Mazzitelli <mazz(a)redhat.com&gt; Commit: 990b2296a9f00384fbed18dcdf7c3c2b39bc41ef https://github.com/rhq-project/rhq/commit/990b2296a9f00384fbed18dcdf7c3c2... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-09-29 (Mon, 29 Sep 2014) Changed paths: M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java Log Message: ----------- [BZ 1070262] Few more changes to the agent config update to allow the agent to continue with the startup procedure even if there is an error in the obfuscation attempt. (cherry picked from commit 99d8ae11fc1cea26e4b3a116a127757b6be68846) Signed-off-by: John Mazzitelli <mazz(a)redhat.com&gt; Compare: https://github.com/rhq-project/rhq/compare/482f0df44248...990b2296a9f0