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 110E9200BEE for ; Fri, 25 Nov 2016 08:41:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0FE1B160AF6; Fri, 25 Nov 2016 07:41:22 +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 6D964160B1D for ; Fri, 25 Nov 2016 08:41:21 +0100 (CET) Received: (qmail 34961 invoked by uid 500); 25 Nov 2016 07:41:20 -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 34854 invoked by uid 99); 25 Nov 2016 07:41:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Nov 2016 07:41:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0625AF1772; Fri, 25 Nov 2016 07:41:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Fri, 25 Nov 2016 07:41:22 -0000 Message-Id: <39eba00960dc42128deb169abf34b1f0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: updated refs/heads/master to d8c038e archived-at: Fri, 25 Nov 2016 07:41:22 -0000 Merge pull request #1635 from myENA/feature/honor_force_stop_vm CLOUDSTACK-9451https://issues.apache.org/jira/browse/CLOUDSTACK-9451 Re-doing against 4.8 since this is a bug, not a feature. * pr/1635: CLOUDSTACK-9451 Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5811d336 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5811d336 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5811d336 Branch: refs/heads/master Commit: 5811d33658fe1651e43dcca67c35c712f9ba4107 Parents: 020606e 53fd4a7 Author: Rohit Yadav Authored: Fri Nov 25 12:56:23 2016 +0530 Committer: Rohit Yadav Committed: Fri Nov 25 12:56:23 2016 +0530 ---------------------------------------------------------------------- engine/api/src/com/cloud/vm/VirtualMachineManager.java | 2 ++ .../engine/cloud/entity/api/VirtualMachineEntity.java | 6 ++++++ .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 12 ++++++++++++ .../engine/cloud/entity/api/VMEntityManager.java | 2 ++ .../engine/cloud/entity/api/VMEntityManagerImpl.java | 6 ++++++ .../cloud/entity/api/VirtualMachineEntityImpl.java | 5 +++++ server/src/com/cloud/vm/UserVmManagerImpl.java | 7 ++++++- 7 files changed, 39 insertions(+), 1 deletion(-) ----------------------------------------------------------------------