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 76A5817AFB for ; Thu, 2 Oct 2014 18:19:32 +0000 (UTC) Received: (qmail 33429 invoked by uid 500); 2 Oct 2014 18:19:32 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 33390 invoked by uid 500); 2 Oct 2014 18:19:32 -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 33380 invoked by uid 99); 2 Oct 2014 18:19:32 -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, 02 Oct 2014 18:19:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4E913A1737F; Thu, 2 Oct 2014 18:19:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: amoghvk@apache.org To: commits@cloudstack.apache.org Date: Thu, 02 Oct 2014 18:19:31 -0000 Message-Id: <6553f3994e964d59a37b83c57561393e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to dfe2bfe Repository: cloudstack Updated Branches: refs/heads/master 0646588fc -> dfe2bfefb Remove adding implicit tags in DB schema so that management server starts, original commit 39fe766c2b6fb6edd4c1 needs review Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/597d3d70 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/597d3d70 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/597d3d70 Branch: refs/heads/master Commit: 597d3d70371f71765d1db8292b298b91acb15417 Parents: d46251f Author: amoghvk Authored: Thu Oct 2 11:18:41 2014 -0700 Committer: amoghvk Committed: Thu Oct 2 11:18:41 2014 -0700 ---------------------------------------------------------------------- setup/db/db/schema-441to450.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/597d3d70/setup/db/db/schema-441to450.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql index 02971f6..b1a1dc1 100644 --- a/setup/db/db/schema-441to450.sql +++ b/setup/db/db/schema-441to450.sql @@ -443,7 +443,7 @@ CREATE VIEW `cloud`.`template_view` AS UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC,Hyperv' WHERE name='hypervisor.list'; UPDATE `cloud`.`configuration` SET description="If set to true, will set guest VM's name as it appears on the hypervisor, to its hostname. The flag is supported for VMware hypervisor only" WHERE name='vm.instancename.flag'; -INSERT IGNORE INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Hidden', 'DEFAULT', 'ImplicitHostTags', 'implicit.host.tags', 'GPU', 'Tag hosts at the time of host disovery based on the host properties/capabilities ', 'GPU') ON DUPLICATE KEY UPDATE category='Hidden'; +-- INSERT IGNORE INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Hidden', 'DEFAULT', 'ImplicitHostTags', 'implicit.host.tags', 'GPU', 'Tag hosts at the time of host disovery based on the host properties/capabilities ', 'GPU') ON DUPLICATE KEY UPDATE category='Hidden'; DROP VIEW IF EXISTS `cloud`.`domain_router_view`; CREATE VIEW `cloud`.`domain_router_view` AS