You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/10/28 10:27:03 UTC
[cloudstack] branch master updated (f66ae34 -> 6de8e01)
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 f66ae34 Fix Usage failed to get pid (#4144)
add dbb6685 server: update template to another template type (#3945)
new 6de8e01 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:
.../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(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'
Posted by ro...@apache.org.
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 <ro...@shapeblue.com>
AuthorDate: Wed Oct 28 15:56:14 2020 +0530
Merge remote-tracking branch 'origin/4.14'
Signed-off-by: Rohit Yadav <ro...@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;
+ }
}