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 874c7be server: add conditions for custom offerings (#4540)
add 4617be4 vmware: Fix template upload from local (#4555)
No new revisions were added by this update.
Summary of changes:
.../template/GetUploadParamsForTemplateCmd.java | 10 +++-
.../storage/command/UploadStatusAnswer.java | 19 ++++++
.../image/deployasis/DeployAsIsHelperImpl.java | 68 +++++++---------------
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 19 ++++++
.../com/cloud/template/TemplateAdapterBase.java | 15 ++++-
.../storage/image/deployasis/DeployAsIsHelper.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 10 ++++
.../cloudstack/storage/template/UploadEntity.java | 19 ++++++
8 files changed, 111 insertions(+), 55 deletions(-)
rename {engine/storage =>
server}/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelper.java
(87%)
