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 C6EDF10098 for ; Mon, 22 Jul 2013 05:37:43 +0000 (UTC) Received: (qmail 72425 invoked by uid 500); 22 Jul 2013 05:37:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 72254 invoked by uid 500); 22 Jul 2013 05:37:16 -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 71693 invoked by uid 99); 22 Jul 2013 05:37:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jul 2013 05:37:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D433E8B0401; Mon, 22 Jul 2013 05:37:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yasker@apache.org To: commits@cloudstack.apache.org Date: Mon, 22 Jul 2013 05:37:23 -0000 Message-Id: <2bad735772ba428c83ae67941f40491b@git.apache.org> In-Reply-To: <9e4d970aa53f475ab41429fafa5de378@git.apache.org> References: <9e4d970aa53f475ab41429fafa5de378@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] git commit: updated refs/heads/pvlan to ce299da CLOUDSTACK-751: 41-42 DB upgrade - insert new global config blacklisted.routes Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7cae8ca2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7cae8ca2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7cae8ca2 Branch: refs/heads/pvlan Commit: 7cae8ca23102a834509f0277a378e17670992ac6 Parents: 31a6770 Author: Alena Prokharchyk Authored: Fri May 17 15:06:50 2013 -0700 Committer: Alena Prokharchyk Committed: Fri May 17 15:07:21 2013 -0700 ---------------------------------------------------------------------- setup/db/db/schema-410to420.sql | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cae8ca2/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index fe66207..c088ac1 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -1667,6 +1667,10 @@ CREATE TABLE `cloud`.`nic_ip_alias` ( alter table `cloud`.`vpc_gateways` add column network_acl_id bigint unsigned default 1 NOT NULL; update `cloud`.`vpc_gateways` set network_acl_id = 2; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'VpcManager', 'blacklisted.routes', NULL, 'Routes that are blacklisted, can not be used for Static Routes creation for the VPC Private Gateway'); + + -- Re-enable foreign key checking, at the end of the upgrade path SET foreign_key_checks = 1;