This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 612100c84a540249a4c52522320d4fd25409f197
Merge: 3ac8194 77947f2
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Tue Jun 16 12:23:23 2020 +0530
Merge remote-tracking branch 'origin/4.14'
.../java/com/cloud/vm/VirtualMachineManager.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 87 ++++++++++++++++------
.../main/java/com/cloud/vm/VmWorkReconfigure.java | 19 ++++-
.../com/cloud/server/ManagementServerImpl.java | 10 +--
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 --
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 67 +----------------
.../test/java/com/cloud/vm/UserVmManagerTest.java | 6 +-
7 files changed, 90 insertions(+), 108 deletions(-)
