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 <[email protected]> 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/4.9 Commit: 5811d33658fe1651e43dcca67c35c712f9ba4107 Parents: 020606e 53fd4a7 Author: Rohit Yadav <[email protected]> Authored: Fri Nov 25 12:56:23 2016 +0530 Committer: Rohit Yadav <[email protected]> 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(-) ----------------------------------------------------------------------
