Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EA70911537 for ; Thu, 27 Mar 2014 09:29:57 +0000 (UTC) Received: (qmail 62145 invoked by uid 500); 27 Mar 2014 09:29:56 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 61832 invoked by uid 500); 27 Mar 2014 09:29:55 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 61812 invoked by uid 99); 27 Mar 2014 09:29:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 09:29:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9EF08837919; Thu, 27 Mar 2014 09:29:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Date: Thu, 27 Mar 2014 09:29:54 -0000 Message-Id: <545fc1ab343d48ca9505d2b11feae006@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 3060f88 Added fix for CLOUDSTACK-6269 Added fix for CLOUDSTACK-6269.More details inside the bug Signed-off-by: Santhosh Edukulla 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 Authored: Wed Mar 26 00:45:44 2014 +0530 Committer: Kishan Kavala 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