Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: e3f67686ed6e4f2d0c1e9263bed51e32c5ff31d9 https://github.com/rhq-project/rhq/commit/e3f67686ed6e4f2d0c1e9263bed51e3... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-09-26 (Fri, 26 Sep 2014) Changed paths: M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java Log Message: ----------- [BZ 1070262] Updates to the configuration upgrade code for the server and the agent. This commit resolves the upgrade obfuscation for rhq-server.properties file and some minor tweaks for the agent-configuration.xml file. (cherry picked from commit 4d27730aee50a12910e754157ce6e6d13556693a) Signed-off-by: John Mazzitelli <mazz(a)redhat.com&gt; Commit: 27ba7a32aab8b2e99c8bd53057ccbc6ebe427837 https://github.com/rhq-project/rhq/commit/27ba7a32aab8b2e99c8bd53057ccbc6... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-09-26 (Fri, 26 Sep 2014) Changed paths: M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java Log Message: ----------- [BZ 1070262] Snip superfluous "public" access modifier. (cherry picked from commit 3ff036a33887fdc3cfa4463f2e1179d183e0c5e2) Signed-off-by: John Mazzitelli <mazz(a)redhat.com&gt; Compare: https://github.com/rhq-project/rhq/compare/cf00bbefe39e...27ba7a32aab8