Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9970A200CAE for ; Tue, 6 Jun 2017 12:00:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 972C8160BC3; Tue, 6 Jun 2017 10:00:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 18AC4160BC6 for ; Tue, 6 Jun 2017 12:00:31 +0200 (CEST) Received: (qmail 24658 invoked by uid 500); 6 Jun 2017 10:00:31 -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 24645 invoked by uid 99); 6 Jun 2017 10:00:31 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jun 2017 10:00:31 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3FB7981190; Tue, 6 Jun 2017 10:00:29 +0000 (UTC) Date: Tue, 06 Jun 2017 10:00:30 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] 01/01: Merge pull request #2108 from shapeblue/force-stop-vm-kvm MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: rajani@apache.org Reply-To: "commits@cloudstack.apache.org" In-Reply-To: <149674322956.11964.11825582655650358993@gitbox.apache.org> References: <149674322956.11964.11825582655650358993@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cloudstack X-Git-Refname: refs/heads/4.9 X-Git-Reftype: branch X-Git-Rev: 5f35c15b6b3ff49cb49c5563abbef7cc0e21d4a7 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170606100030.3FB7981190@gitbox.apache.org> archived-at: Tue, 06 Jun 2017 10:00:32 -0000 This is an automated email from the ASF dual-hosted git repository. rajani pushed a commit to branch 4.9 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 5f35c15b6b3ff49cb49c5563abbef7cc0e21d4a7 Merge: b65a58b 8323a17 Author: Rajani Karuturi AuthorDate: Tue Jun 6 15:30:24 2017 +0530 Merge pull request #2108 from shapeblue/force-stop-vm-kvm [4.9+] CLOUDSTACK-9860: Power off VMs when force stop is provided .../cloudstack/api/command/user/vm/StopVMCmd.java | 2 +- core/src/com/cloud/agent/api/StopCommand.java | 11 +++++++ .../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- .../kvm/resource/LibvirtComputingResource.java | 13 +++++--- .../wrapper/LibvirtStopCommandWrapper.java | 3 +- .../hypervisor/vmware/resource/VmwareResource.java | 13 +++++--- .../xenserver/resource/CitrixResourceBase.java | 11 +++++-- .../wrapper/xenbase/CitrixStopCommandWrapper.java | 2 +- test/integration/smoke/test_vm_life_cycle.py | 36 +++++++++++++++++++++- 9 files changed, 76 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .