Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d8c038e5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d8c038e5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d8c038e5 Branch: refs/heads/master Commit: d8c038e5b215f24b58fb1b4ff6b3837fbab5d9ce Parents: 16c2761 50f80cc Author: Rohit Yadav <[email protected]> Authored: Fri Nov 25 13:10:56 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Fri Nov 25 13:10:56 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 +++++ .../networkservice/BaremetalPxeManagerImpl.java | 2 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 7 ++++++- 8 files changed, 40 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8c038e5/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8c038e5/server/src/com/cloud/vm/UserVmManagerImpl.java ----------------------------------------------------------------------
