modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
New commits: commit e1a4fd30809490e637ce50185300831dcdf85ac6 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Aug 20 14:22:02 2013 -0400
fix merge issue.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java index 0670589..41f4b64 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java @@ -51,9 +51,9 @@ import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; +import org.rhq.core.domain.cloud.StorageClusterSettings; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.domain.cloud.StorageNode.OperationMode; -import org.rhq.core.domain.cloud.StorageClusterSettings; import org.rhq.core.domain.cloud.StorageNodeConfigurationComposite; import org.rhq.core.domain.cloud.StorageNodeLoadComposite; import org.rhq.core.domain.common.JobTrigger; @@ -685,12 +685,6 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN
return configuration; } - - @Override - @Asynchronous - public void updateConfigurationAsync(Subject subject, StorageNodeConfigurationComposite storageNodeConfiguration) { - updateConfiguration(subject, storageNodeConfiguration); - }
@Override @Asynchronous
rhq-commits@lists.fedorahosted.org