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 1FED0106EA for ; Fri, 2 Aug 2013 06:40:41 +0000 (UTC) Received: (qmail 84367 invoked by uid 500); 2 Aug 2013 06:40:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 84166 invoked by uid 500); 2 Aug 2013 06:40:40 -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 84151 invoked by uid 99); 2 Aug 2013 06:40:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Aug 2013 06:40:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8D88D8B6E2E; Fri, 2 Aug 2013 06:40:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Date: Fri, 02 Aug 2013 06:40:40 -0000 Message-Id: In-Reply-To: <49d46728b20841b2bfaec07ba095e75c@git.apache.org> References: <49d46728b20841b2bfaec07ba095e75c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 65fc2ec CLOUDSTACK-4032: Added KVM.snapshot.enabled config to 41to42 upgrade Conflicts: setup/db/db/schema-410to420.sql Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65fc2ec3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65fc2ec3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65fc2ec3 Branch: refs/heads/master Commit: 65fc2ec345e65d18581dd566c1bf605dc004795c Parents: f3dd0c6 Author: Kishan Kavala Authored: Fri Aug 2 11:58:48 2013 +0530 Committer: Kishan Kavala Committed: Fri Aug 2 12:04:33 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/configuration/Config.java | 4 +++- setup/db/db/schema-410to420.sql | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65fc2ec3/server/src/com/cloud/configuration/Config.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index c2b1346..1d1624b 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -572,7 +572,9 @@ public enum Config { return "TemplateManager"; } else if (_componentClass == VpcManager.class) { return "VpcManager"; - }else { + } else if (_componentClass == SnapshotManager.class) { + return "SnapshotManager"; + } else { return "none"; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65fc2ec3/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 99a0208..6aa1222 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -2220,3 +2220,5 @@ CREATE TABLE `cloud_usage`.`usage_vmsnapshot` ( ) ENGINE=InnoDB CHARSET=utf8; ALTER TABLE volumes ADD COLUMN vm_snapshot_chain_size bigint(20) unsigned; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Snapshots', 'DEFAULT', 'SnapshotManager', 'KVM.snapshot.enabled', 'false', 'whether snapshot is enabled for KVM hosts');