You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/03/27 10:22:48 UTC
git commit: updated refs/heads/4.4 to 38b8677
Repository: cloudstack
Updated Branches:
refs/heads/4.4 50b92054c -> 38b8677e0
Added fix for CLOUDSTACK-6269
Added fix for CLOUDSTACK-6269.More details inside the bug
Signed-off-by: Santhosh Edukulla <Sa...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38b8677e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38b8677e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38b8677e
Branch: refs/heads/4.4
Commit: 38b8677e01fe1ec89df43abe9fac26295597080f
Parents: 50b9205
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Wed Mar 26 00:45:44 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Thu Mar 27 14:46:11 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/38b8677e/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