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 B6FDC10640 for ; Thu, 27 Jun 2013 20:57:10 +0000 (UTC) Received: (qmail 21531 invoked by uid 500); 27 Jun 2013 20:57:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 21477 invoked by uid 500); 27 Jun 2013 20:57:05 -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 21076 invoked by uid 99); 27 Jun 2013 20:57:05 -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, 27 Jun 2013 20:57:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2C3AB38B10; Thu, 27 Jun 2013 20:57:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: commits@cloudstack.apache.org Date: Thu, 27 Jun 2013 20:57:31 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] [abbrv] git commit: updated refs/heads/vmsync to 3c2aa18 CLOUDSTACK-2835: Change function from execute to executeUpdate Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c102a05 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c102a05 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c102a05 Branch: refs/heads/vmsync Commit: 1c102a0589cb5b99c2c6922e8eea0a082608410d Parents: c059153 Author: Nitin Mehta Authored: Wed Jun 26 17:47:17 2013 +0530 Committer: Nitin Mehta Committed: Wed Jun 26 17:47:17 2013 +0530 ---------------------------------------------------------------------- engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c102a05/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index c67a971..a70f4b9 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -213,7 +213,7 @@ public class Upgrade410to420 implements DbUpgrade { // update templete ID of system Vms pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = 'KVM'"); pstmt.setLong(1, templateId); - pstmt.execute(); + pstmt.executeUpdate(); pstmt.close(); // Change value of global configuration parameter router.template.kvm pstmt = conn.prepareStatement("INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'NetworkManager', 'router.template.kvm', 'systemvm-kvm-4.2', 'Name of the default router template on KVM')");