This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch guestOSMappingfromOVFinVMWare
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
discard 2815d01 Updated os description logic to keep equals ignore match with
guest os display name
discard a9a1971 Updated the java doc section
discard 103d95e Added unit tests to String Utils methods and updated the code
discard e88f526 Fix for mapping guest OS type read from OVF to existing guest
OS in CloudStack database while registering VMware template
add 874c7be server: add conditions for custom offerings (#4540)
add 4617be4 vmware: Fix template upload from local (#4555)
add 7c79723 Fix for mapping guest OS type read from OVF to existing guest
OS in CloudStack database while registering VMware template
add f72f2fd Added unit tests to String Utils methods and updated the code
add c1a9f41 Updated the java doc section
add 4b8adeb Updated os description logic to keep equals ignore match with
guest os display name
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2815d01)
\
N -- N -- N refs/heads/guestOSMappingfromOVFinVMWare (4b8adeb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../template/GetUploadParamsForTemplateCmd.java | 10 +++-
.../storage/command/UploadStatusAnswer.java | 19 ++++++
.../image/deployasis/DeployAsIsHelperImpl.java | 69 +++++++---------------
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 19 ++++++
.../com/cloud/template/TemplateAdapterBase.java | 15 ++++-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 7 ++-
.../storage/image/deployasis/DeployAsIsHelper.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 10 ++++
.../cloudstack/storage/template/UploadEntity.java | 19 ++++++
9 files changed, 116 insertions(+), 58 deletions(-)
rename {engine/storage =>
server}/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelper.java
(87%)
