Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: 23eb9986e61d1acaad86a0e20d9a0412ead89095 https://github.com/rhq-project/rhq/commit/23eb9986e61d1acaad86a0e20d9a041... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-10-17 (Fri, 17 Oct 2014) Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java Log Message: ----------- [1092707] If re-install is attempted using a different storage node host name, install fails Allow a re-install/re-upgrade to replaceme existing storage node definitions as long as the storage nodes have not actually been used. Basically, if none of the storage nodes are yet linked to a resource, they are eligible for replacement. (cherry picked from commit a074c1851c7f271e97478625112a1de315ee1bd3) Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Commit: be39b9a15862e80f84160d0e4ab00e081b894216 https://github.com/rhq-project/rhq/commit/be39b9a15862e80f84160d0e4ab00e0... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-10-23 (Thu, 23 Oct 2014) Changed paths: M code-coverage/pom.xml M modules/cli-tests/pom.xml M modules/common/ant-bundle/pom.xml M modules/common/cassandra-auth/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml M modules/common/cassandra-ccm/pom.xml M modules/common/cassandra-installer/pom.xml M modules/common/cassandra-schema/pom.xml M modules/common/cassandra-util/pom.xml M modules/common/drift/pom.xml M modules/common/filetemplate-bundle/pom.xml M modules/common/jboss-as-dmr-client/pom.xml M modules/common/jboss-as/pom.xml M modules/common/pom.xml M modules/common/wfly-patch-parser/pom.xml M modules/core/arquillian-integration/archive/pom.xml M modules/core/arquillian-integration/container/pom.xml M modules/core/arquillian-integration/pom.xml M modules/core/arquillian-integration/suite-extension/pom.xml M modules/core/arquillian-integration/test-agent-plugin/pom.xml M modules/core/client-api/pom.xml M modules/core/comm-api/pom.xml M modules/core/dbutils/pom.xml M modules/core/domain/pom.xml M modules/core/gui/pom.xml M modules/core/native-system/pom.xml M modules/core/plugin-api/pom.xml M modules/core/plugin-container-itest/pom.xml M modules/core/plugin-container/pom.xml M modules/core/plugin-test-api/pom.xml M modules/core/plugin-test-util/pom.xml M modules/core/plugin-validator/pom.xml M modules/core/plugindoc/pom.xml M modules/core/pom.xml M modules/core/util/pom.xml M modules/enterprise/agent/pom.xml M modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh M modules/enterprise/agent/src/etc/rhq-agent.sh M modules/enterprise/agent/src/etc/standalone-pc.sh M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java M modules/enterprise/agentupdate/pom.xml M modules/enterprise/binding/pom.xml M modules/enterprise/comm/pom.xml M modules/enterprise/gui/agentupdate-war/pom.xml M modules/enterprise/gui/content_http-war/pom.xml M modules/enterprise/gui/coregui/pom.xml M modules/enterprise/gui/downloads-war/pom.xml M modules/enterprise/gui/pom.xml M modules/enterprise/gui/portal-war/pom.xml M modules/enterprise/gui/remote-client-war/pom.xml M modules/enterprise/gui/remoting-war/pom.xml M modules/enterprise/gui/rest-examples-war/pom.xml M modules/enterprise/gui/rest-war/pom.xml M modules/enterprise/gui/rh-access-war/pom.xml M modules/enterprise/gui/rh-access-war/src/main/webapp/css/redhat_access_angular_ui-embedded-images.css M modules/enterprise/gui/rh-access-war/src/main/webapp/js/redhat_access_angular_ui-deps.js M modules/enterprise/gui/rh-access-war/src/main/webapp/js/redhat_access_angular_ui.js M modules/enterprise/gui/rh-access-war/src/main/webapp/support.html M modules/enterprise/pom.xml M modules/enterprise/remoting/cli/pom.xml M modules/enterprise/remoting/cli/src/etc/rhq-cli.sh M modules/enterprise/remoting/client-api/pom.xml M modules/enterprise/remoting/client-deps/pom.xml M modules/enterprise/remoting/pom.xml M modules/enterprise/scripting/api/pom.xml M modules/enterprise/scripting/javascript/pom.xml M modules/enterprise/scripting/pom.xml M modules/enterprise/scripting/python/pom.xml M modules/enterprise/server/appserver/pom.xml M modules/enterprise/server/client-api/pom.xml M modules/enterprise/server/data-migration/pom.xml M modules/enterprise/server/ear/pom.xml M modules/enterprise/server/embeddedagent/pom.xml M modules/enterprise/server/installer/pom.xml M modules/enterprise/server/itests-2/pom.xml M modules/enterprise/server/jar/pom.xml M modules/enterprise/server/plugins/alert-aerogear-ups/pom.xml M modules/enterprise/server/plugins/alert-cli/pom.xml M modules/enterprise/server/plugins/alert-email/pom.xml M modules/enterprise/server/plugins/alert-irc/pom.xml M modules/enterprise/server/plugins/alert-log4j/pom.xml M modules/enterprise/server/plugins/alert-microblog/pom.xml M modules/enterprise/server/plugins/alert-mobicents/pom.xml M modules/enterprise/server/plugins/alert-operations/pom.xml M modules/enterprise/server/plugins/alert-roles/pom.xml M modules/enterprise/server/plugins/alert-snmp/pom.xml M modules/enterprise/server/plugins/alert-subject/pom.xml M modules/enterprise/server/plugins/alertdef-rhq/pom.xml M modules/enterprise/server/plugins/ant-bundle/pom.xml M modules/enterprise/server/plugins/cobbler/pom.xml M modules/enterprise/server/plugins/disk/pom.xml M modules/enterprise/server/plugins/drift-rhq/pom.xml M modules/enterprise/server/plugins/filetemplate-bundle/pom.xml M modules/enterprise/server/plugins/jboss-software/pom.xml M modules/enterprise/server/plugins/jdr-support/pom.xml M modules/enterprise/server/plugins/packagetype-cli/pom.xml M modules/enterprise/server/plugins/pom.xml M modules/enterprise/server/plugins/url/pom.xml M modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml M modules/enterprise/server/plugins/wfly-patch-bundle/pom.xml M modules/enterprise/server/plugins/yum/pom.xml M modules/enterprise/server/pom.xml M modules/enterprise/server/safe-invoker/pom.xml M modules/enterprise/server/server-control/pom.xml M modules/enterprise/server/server-jdr/pom.xml M modules/enterprise/server/server-metrics/pom.xml M modules/enterprise/server/startup-subsystem/pom.xml M modules/enterprise/server/xml-schemas/pom.xml M modules/helpers/bundleGen/pom.xml M modules/helpers/jeeGen/pom.xml M modules/helpers/metrics-simulator/pom.xml M modules/helpers/perftest-support/pom.xml M modules/helpers/pom.xml M modules/helpers/rest-docs-generator/pom.xml M modules/helpers/rtfilter-subsystem/pom.xml M modules/helpers/rtfilter/pom.xml M modules/integration-tests/apache-plugin-test/pom.xml M modules/integration-tests/jndi-access/jndi-access-test/pom.xml M modules/integration-tests/jndi-access/pom.xml M modules/integration-tests/jndi-access/remote-server/pom.xml M modules/integration-tests/pom.xml M modules/integration-tests/rest-api/pom.xml M modules/plugins/OpenShift-support/pom.xml M modules/plugins/aliases/pom.xml M modules/plugins/ant-bundle/pom.xml M modules/plugins/apache/pom.xml M modules/plugins/augeas/pom.xml M modules/plugins/byteman/pom.xml M modules/plugins/cassandra/pom.xml M modules/plugins/cobbler/pom.xml M modules/plugins/cron/pom.xml M modules/plugins/database/pom.xml M modules/plugins/filetemplate-bundle/pom.xml M modules/plugins/grub/pom.xml M modules/plugins/hadoop/pom.xml M modules/plugins/hibernate/pom.xml M modules/plugins/hosts/pom.xml M modules/plugins/hudson/pom.xml M modules/plugins/iis/pom.xml M modules/plugins/irc/pom.xml M modules/plugins/jboss-as-5/pom.xml M modules/plugins/jboss-as-7-jmx/pom.xml M modules/plugins/jboss-as-7/pom.xml M modules/plugins/jboss-as/pom.xml M modules/plugins/jboss-cache-v3/pom.xml M modules/plugins/jboss-cache/pom.xml M modules/plugins/jmx/pom.xml M modules/plugins/kickstart/pom.xml M modules/plugins/mod-cluster/pom.xml M modules/plugins/mysql/pom.xml M modules/plugins/netservices/pom.xml M modules/plugins/noop/pom.xml M modules/plugins/oracle/pom.xml M modules/plugins/pattern-generator/pom.xml M modules/plugins/perftest/pom.xml M modules/plugins/platform/pom.xml M modules/plugins/pom.xml M modules/plugins/postfix/pom.xml M modules/plugins/postgres/pom.xml M modules/plugins/rhq-agent/pom.xml M modules/plugins/rhq-server/pom.xml M modules/plugins/rhq-storage/pom.xml M modules/plugins/samba/pom.xml M modules/plugins/script/pom.xml M modules/plugins/script2/pom.xml M modules/plugins/snmptrapd/pom.xml M modules/plugins/sonarqube/pom.xml M modules/plugins/sshd/pom.xml M modules/plugins/sudoers/pom.xml M modules/plugins/tomcat/pom.xml M modules/plugins/twitter/pom.xml M modules/plugins/validate-all-plugins/pom.xml M modules/plugins/virt/pom.xml M modules/pom.xml M modules/test-utils/pom.xml M pom.xml Log Message: ----------- Merge branch 'release/jon3.3.x' of github.com:rhq-project/rhq into release/jon3.3.x Commit: b2c528d24fc7d1ca31682520a90b45a4fd4b7b14 https://github.com/rhq-project/rhq/commit/b2c528d24fc7d1ca31682520a90b45a... Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Date: 2014-10-23 (Thu, 23 Oct 2014) Changed paths: M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml Log Message: ----------- [1155612] upgrade from jon 3.1.2 to jon 3.3.0 er05 does not work Fix an install issue when upgrading from a BSN (before storage nodes) version. Go back to the legacy db-upgrade step that adds the entire rhq_storage_node table and make it match the same table definition you'd get from a new db. Because no SNs existed at upgrade-time the version column updater never gets a chance to execute. And therefore the insertion of the initial SN fails. (cherry picked from commit 0e4c52efca13a54937cdc71d703afa89d681f710) Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com&gt; Compare: https://github.com/rhq-project/rhq/compare/d9f66ebaa1e0...b2c528d24fc7