This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from db665fa Merge remote-tracking branch 'origin/4.14' add cd8e28b server: Move restoreVM to vm work job queue (#4019) new 562a7db Merge remote-tracking branch 'origin/4.14' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: api/src/main/java/com/cloud/vm/UserVmService.java | 2 + .../java/com/cloud/vm/VirtualMachineManager.java | 3 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 104 +++++++++++ ...WorkRemoveNicFromVm.java => VmWorkRestore.java} | 14 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 8 +- .../test/java/com/cloud/vm/UserVmManagerTest.java | 194 --------------------- 6 files changed, 122 insertions(+), 203 deletions(-) copy engine/orchestration/src/main/java/com/cloud/vm/{VmWorkRemoveNicFromVm.java => VmWorkRestore.java} (72%)