Updated Branches:
refs/heads/master ebdc5786b -> 205652441
CLOUDSTACK-4224
UCS:UI: Delete UCS returns unknown API
Conflicts:
plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20565244
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20565244
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20565244
Branch: refs/heads/master
Commit: 205652441133c0e51690ceef6101ea8153f8352e
Parents: ebdc578
Author: frank <[email protected]>
Authored: Mon Aug 12 12:08:46 2013 -0700
Committer: frank <[email protected]>
Committed: Mon Aug 12 12:10:35 2013 -0700
----------------------------------------------------------------------
.../ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20565244/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
index ba4f3d5..9c8bc4e 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
@@ -40,8 +40,8 @@ import org.apache.cloudstack.api.response.UcsBladeResponse;
import org.apache.cloudstack.api.response.UcsManagerResponse;
import org.apache.cloudstack.api.response.UcsProfileResponse;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-
-import org.apache.log4j.Logger;
+import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.DeleteUcsManagerCmd;
import com.cloud.configuration.Config;
import com.cloud.dc.ClusterDetailsDao;
@@ -503,6 +503,7 @@ public class UcsManagerImpl implements UcsManager {
cmds.add(ListUcsProfileCmd.class);
cmds.add(AddUcsManagerCmd.class);
cmds.add(AssociateUcsProfileToBladeCmd.class);
+ cmds.add(DeleteUcsManagerCmd.class);
return cmds;
}
