cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 3060f88
Date Thu, 27 Mar 2014 09:29:54 GMT
Added fix for CLOUDSTACK-6269

Added fix for CLOUDSTACK-6269.More details inside the bug

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>


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

Branch: refs/heads/master
Commit: 3060f884ab62d92ade9073a147dee204aba4a889
Parents: fe7b753
Author: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Authored: Wed Mar 26 00:45:44 2014 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Thu Mar 27 14:53:43 2014 +0530

----------------------------------------------------------------------
 .../simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3060f884/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
index 27002f2..f487eb4 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -26,6 +26,7 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.network.VirtualNetworkApplianceService;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -568,7 +569,8 @@ public class MockVmManagerImpl extends ManagerBase implements MockVmManager
{
 
     @Override
     public GetDomRVersionAnswer getDomRVersion(GetDomRVersionCmd cmd) {
-        return new GetDomRVersionAnswer(cmd, null, "CloudStack Release 4.2.0", UUID.randomUUID().toString());
+        String template_version = "CloudStack Release "+ VirtualNetworkApplianceService.MinVRVersion.toString();
+        return new GetDomRVersionAnswer(cmd, null, template_version, UUID.randomUUID().toString());
     }
 
     @Override


Mime
View raw message