[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'

[rohit]

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 6de8e012e84ec228aac33ebdee7969ca24233b93
Merge: f66ae34 dbb6685
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Oct 28 15:56:14 2020 +0530

    Merge remote-tracking branch 'origin/4.14'
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>

 .../command/user/template/UpdateTemplateCmd.java   | 12 ++++
 .../cloudstack/api/response/TemplateResponse.java  |  8 +++
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |  2 +
 .../com/cloud/template/TemplateManagerImpl.java    | 24 +++++++
 ui/scripts/templates.js                            | 77 ++++++++++++++++++++--
 5 files changed, 119 insertions(+), 4 deletions(-)

diff --cc 
api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
index 6e69923,9aeba0f..3633fa7
--- a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
@@@ -436,18 -407,7 +440,22 @@@ public class TemplateResponse extends B
          this.requiresHvm = requiresHvm;
      }
  
 +    public Map<String, String> getDeployAsIsDetails() {
 +        return this.deployAsIsDetails;
 +    }
 +
 +    public void setDeployAsIsDetails(Map<String, String> details) {
 +        this.deployAsIsDetails = details;
 +    }
 +
 +    public void addDeployAsIsDetail(String key, String value) {
 +        if (this.deployAsIsDetails == null) {
 +            setDeployAsIsDetails(new HashMap<>());
 +        }
 +        this.deployAsIsDetails.put(key,value);
 +    }
++
+     public void setUrl(String url) {
+         this.url = url;
+     }
  }