Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6B9A1CD9A for ; Thu, 11 Dec 2014 16:53:43 +0000 (UTC) Received: (qmail 18689 invoked by uid 500); 11 Dec 2014 16:53:42 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 18435 invoked by uid 500); 11 Dec 2014 16:53:42 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 18248 invoked by uid 99); 11 Dec 2014 16:53:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Dec 2014 16:53:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B30FAA26944; Thu, 11 Dec 2014 16:53:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Thu, 11 Dec 2014 16:53:47 -0000 Message-Id: <5fcd570c6f0f452897349823aaad9a98@git.apache.org> In-Reply-To: <09c77af7375a48e6b3b435ad1c06a118@git.apache.org> References: <09c77af7375a48e6b3b435ad1c06a118@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/41] git commit: updated refs/heads/4.4 to 010a217 CLOUDSTACK-7871: allow VM and template details update using update APIs Allows updating details (key/value) pair which updates entries in vm_template_details and user_vm_details tables using updateVM and updateTemplate APIs. This allows sys admins to update nics, controllers etc without DB hacking. Signed-off-by: Rohit Yadav Conflicts: api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java server/src/com/cloud/template/TemplateManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/832fd723 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/832fd723 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/832fd723 Branch: refs/heads/4.4 Commit: 832fd7232c10d369d8492d6be5c1f0313afc78b9 Parents: 99261fb Author: Rohit Yadav Authored: Mon Nov 10 18:12:37 2014 +0530 Committer: Rohit Yadav Committed: Thu Dec 11 20:02:09 2014 +0530 ---------------------------------------------------------------------- api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/832fd723/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java index 2754b25..dd50275 100644 --- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java @@ -122,4 +122,4 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd { Collection paramsCollection = this.details.values(); return (Map) (paramsCollection.toArray())[0]; } -} \ No newline at end of file +}