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 C335EF7C2 for ; Sat, 5 Oct 2013 00:39:21 +0000 (UTC) Received: (qmail 59804 invoked by uid 500); 5 Oct 2013 00:39:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 59786 invoked by uid 500); 5 Oct 2013 00:39:21 -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 59779 invoked by uid 99); 5 Oct 2013 00:39:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Oct 2013 00:39:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4EF3A9103EF; Sat, 5 Oct 2013 00:39:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Date: Sat, 05 Oct 2013 00:39:22 -0000 Message-Id: In-Reply-To: <0dee95d086b347aa8b36ebd9c245c38c@git.apache.org> References: <0dee95d086b347aa8b36ebd9c245c38c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.2 to b63270f CLOUDSTACK-4816: Add global configure s3.multipart.enabled Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b63270f1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b63270f1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b63270f1 Branch: refs/heads/4.2 Commit: b63270f1d355458e9f5f2543d4320c5c832c41fe Parents: 975422a Author: Min Chen Authored: Fri Oct 4 17:27:04 2013 -0700 Committer: Min Chen Committed: Fri Oct 4 17:38:40 2013 -0700 ---------------------------------------------------------------------- .../com/cloud/upgrade/dao/Upgrade420to421.java | 10 ++++++-- setup/db/db/schema-420to421.sql | 24 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b63270f1/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java index 6707eb9..27704e8 100755 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java @@ -26,6 +26,7 @@ import java.sql.SQLException; import org.apache.log4j.Logger; import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.script.Script; public class Upgrade420to421 implements DbUpgrade { final static Logger s_logger = Logger.getLogger(Upgrade420to421.class); @@ -33,7 +34,7 @@ public class Upgrade420to421 implements DbUpgrade { @Override public String[] getUpgradableVersionRange() { - return new String[] { "4.2.0" }; + return new String[] { "4.2.0", "4.2.1" }; } @Override @@ -48,7 +49,12 @@ public class Upgrade420to421 implements DbUpgrade { @Override public File[] getPrepareScripts() { - return null; + String script = Script.findScript("", "db/schema-420to421.sql"); + if (script == null) { + throw new CloudRuntimeException("Unable to find db/schema-420to421.sql"); + } + + return new File[] { new File(script) }; } @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b63270f1/setup/db/db/schema-420to421.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql new file mode 100644 index 0000000..1e6341e --- /dev/null +++ b/setup/db/db/schema-420to421.sql @@ -0,0 +1,24 @@ +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. + +--; +-- Schema upgrade from 4.2.0 to 4.2.1; +--; + + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 's3.multipart.enabled', 'true', 'enable s3 multipart upload'); +