git commit: updated refs/heads/4.2 to b4fe025

[ap...@apache.org]

Updated Branches:
  refs/heads/4.2 478eae828 -> b4fe02522


CLOUDSTACK-3351: Fix add cluster API to set right hypervisor type

Signed-off-by: Abhinandan Prateek <ap...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b4fe0252
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b4fe0252
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b4fe0252

Branch: refs/heads/4.2
Commit: b4fe0252230e74d36f62679cd2a751f278edacc1
Parents: 478eae8
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Thu Jul 4 11:18:35 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Thu Aug 1 13:52:20 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b4fe0252/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 878bfcd..8003734 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -455,7 +455,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         List<ClusterVO> result = new ArrayList<ClusterVO>();
 
         ClusterVO cluster = new ClusterVO(dcId, podId, clusterName);
-        cluster.setHypervisorType(cmd.getHypervisor());
+        cluster.setHypervisorType(hypervisorType.toString());
 
         cluster.setClusterType(clusterType);
         cluster.setAllocationState(allocationState);