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 F0FC910F8C for ; Fri, 27 Dec 2013 09:50:34 +0000 (UTC) Received: (qmail 17284 invoked by uid 500); 27 Dec 2013 09:50:32 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 17274 invoked by uid 500); 27 Dec 2013 09:50:30 -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 17267 invoked by uid 99); 27 Dec 2013 09:50:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Dec 2013 09:50:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EF92E81A92A; Fri, 27 Dec 2013 09:50:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devdeep@apache.org To: commits@cloudstack.apache.org Message-Id: <669ba4c9fb54469e92bec62676df1133@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to cdf2a11 Date: Fri, 27 Dec 2013 09:50:29 +0000 (UTC) Updated Branches: refs/heads/master ea09c0435 -> cdf2a1161 CLOUDSTACK-5649: Vms are stopped and not migrated from a host when the host is put in maintenance mode. The migrate flag wasn't set to true in the maintain answer. This caused cloudstack to not to schedule a migration work item for vms on the host. Made a change to set the migrate flag to true in migrate answer. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cdf2a116 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cdf2a116 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cdf2a116 Branch: refs/heads/master Commit: cdf2a1161bbc16a59d4fa4cc43e820c246ae3da3 Parents: ea09c04 Author: Devdeep Singh Authored: Fri Dec 27 22:15:34 2013 +0530 Committer: Devdeep Singh Committed: Fri Dec 27 15:21:14 2013 +0530 ---------------------------------------------------------------------- .../ServerResource/HypervResource/HypervResourceController.cs | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdf2a116/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index 287f9f2..901b09b 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs @@ -1200,6 +1200,7 @@ namespace HypervResource object ansContent = new { result = true, + willMigrate = true, details = "success - NOP for MaintainCommand", _reconnect = false, contextMap = contextMap