Branch: refs/heads/BZ1069545 Home: https://github.com/rhq-project/rhq Commit: 553d534c064d042fbdd12c22e263a86f3d940143 https://github.com/rhq-project/rhq/commit/553d534c064d042fbdd12c22e263a86f3d... Author: Stefan Negrea snegrea@redhat.com Date: 2014-04-30 (Wed, 30 Apr 2014)

Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java

Log Message: ----------- [BZ 1069545] Fix type merging to support updates to subcategories.